Commit

Author:

Hash:

Timestamp:

+8 -6 +/-5 browse

Kevin Schoon [me@kevinschoon.com]

4a6c6c86afe7f79e3326463891c60656dffca053

Fri, 05 Jul 2024 22:48:13 +0000 (10 months ago)

set reasonable terminal, fix config script
1diff --git a/containers/multiuser/Containerfile b/containers/multiuser/Containerfile
2index d6b5efa..5b830a1 100644
3--- a/containers/multiuser/Containerfile
4+++ b/containers/multiuser/Containerfile
5 @@ -18,7 +18,7 @@ RUN apk add --no-cache \
6 COPY containers/multiuser/init/ /etc/ayllu-init/
7 COPY containers/multiuser/motd.txt /etc/motd
8 COPY containers/multiuser/service/ /etc/service/
9- COPY containers/multiuser/welcome.sh /etc/profile.d/
10+ COPY containers/multiuser/profile.d/ /etc/profile.d/
11 COPY containers/multiuser/run_all.sh /
12
13 CMD ["/run_all.sh"]
14 diff --git a/containers/multiuser/init/config.sh b/containers/multiuser/init/config.sh
15index 0afc6f3..57f51e5 100755
16--- a/containers/multiuser/init/config.sh
17+++ b/containers/multiuser/init/config.sh
18 @@ -1,5 +1,4 @@
19 #!/bin/sh
20- set -e
21
22 # TODO: Ayllu should have a programmatic way to set configuration values
23 # at runtime e.g. ayllu config set http.address = ....
24 diff --git a/containers/multiuser/profile.d/term.sh b/containers/multiuser/profile.d/term.sh
25new file mode 100755
26index 0000000..d554ac5
27--- /dev/null
28+++ b/containers/multiuser/profile.d/term.sh
29 @@ -0,0 +1,3 @@
30+ #!/bin/sh
31+
32+ export TERM=xterm-256color
33 diff --git a/containers/multiuser/profile.d/welcome.sh b/containers/multiuser/profile.d/welcome.sh
34new file mode 100755
35index 0000000..7bc7c6b
36--- /dev/null
37+++ b/containers/multiuser/profile.d/welcome.sh
38 @@ -0,0 +1,4 @@
39+ #!/bin/sh
40+
41+ echo
42+ uptime
43 diff --git a/containers/multiuser/welcome.sh b/containers/multiuser/welcome.sh
44deleted file mode 100755
45index 7bc7c6b..0000000
46--- a/containers/multiuser/welcome.sh
47+++ /dev/null
48 @@ -1,4 +0,0 @@
49- #!/bin/sh
50-
51- echo
52- uptime