crichardson/docker-xubuntu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Dump variables to /etc/environment

Browse Source
This commit is contained in:
Héctor Molinero Fernández
2020-04-28 01:44:13 +02:00
parent caaf9b6b24
commit cce078e0da
3 changed files with 13 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
scripts/bin/container-init
View File

@@ -43,10 +43,6 @@ if [ -n "${UNPRIVILEGED_USER_PASSWORD?}" ]; then
else
passwd -d "${UNPRIVILEGED_USER_NAME:?}"
fi
unset UNPRIVILEGED_USER_PASSWORD
# Dump environment variables
export-env > /etc/profile.d/env.sh
# Enable xdummy service if ENABLE_XDUMMY is true
if [ "${ENABLE_XDUMMY:?}" = 'true' ]; then
@@ -68,9 +64,9 @@ if [ ! -f /etc/ssh/ssh_host_rsa_key ]; then
fi
# Generate RDP certificate if it does not exist
if [ ! -f "${XRDP_TLS_KEY_PATH:?}" ] || [ ! -f "${XRDP_TLS_CERT_PATH:?}" ]; then
if [ ! -f "${XRDP_TLS_KEY_PATH:?}" ] || [ ! -f "${XRDP_TLS_CRT_PATH:?}" ]; then
KEY_FILE=${XRDP_TLS_KEY_PATH:?}
CRT_FILE=${XRDP_TLS_CERT_PATH:?}
CRT_FILE=${XRDP_TLS_CRT_PATH:?}
CSR_FILE=$(mktemp -u)
(umask 077 \
@@ -84,5 +80,8 @@ if [ ! -f "${XRDP_TLS_KEY_PATH:?}" ] || [ ! -f "${XRDP_TLS_CERT_PATH:?}" ]; then
) >/dev/null
fi
# Dump environment variables
env | grep -Ev '^(PWD|HOME|USER|USERNAME|SHELL|TERM|SHLVL)=' | sort > /etc/environment
# Start runit
exec tini -- runsvdir -P /etc/service/

9
scripts/bin/export-env
View File

@@ -1,9 +0,0 @@
#!/usr/bin/awk -f
BEGIN {for (v in ENVIRON) {
if (v !~ /^(_|AWKPATH|AWKLIBPATH|TERM|SHLVL|PWD|HOME|SHELL|HOSTNAME|UID|USER|GID|GROUP)$/) {
gsub(/[^0-9A-Za-z_]/, "_", v);
gsub(/'/, "'\\''", ENVIRON[v]);
print("export "v"='"ENVIRON[v]"'");
}
}}