From 56a988eb098c415674044156e531d08091a375e3 Mon Sep 17 00:00:00 2001 From: Ali Mustakim Date: Thu, 18 Jan 2024 16:56:24 -0500 Subject: [PATCH] updates --- base_debian/Dockerfile | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/base_debian/Dockerfile b/base_debian/Dockerfile index e9c08e1..d59bfe1 100644 --- a/base_debian/Dockerfile +++ b/base_debian/Dockerfile @@ -28,15 +28,15 @@ ENV USER="ali" \ PUID="1001" \ PGID="1001" \ APP_DIR="/app" \ - CONFIG_DIR="/config" \ + # CONFIG_DIR="/config" \ TZ="America/Toronto" \ _CHAR="UTF-8" \ _LANG="en" \ _CNTRY="US" -ENV XDG_CONFIG_HOME=${CONFIG_DIR}/.config \ - XDG_CACHE_HOME=${CONFIG_DIR}/.cache \ - XDG_DATA_HOME=${CONFIG_DIR}/.local/share \ - LANG=${_LANG}_${_CNTRY}.${_CHAR} \ +# ENV XDG_CONFIG_HOME=${CONFIG_DIR}/.config \ +# XDG_CACHE_HOME=${CONFIG_DIR}/.cache \ +# XDG_DATA_HOME=${CONFIG_DIR}/.local/share \ +ENV LANG=${_LANG}_${_CNTRY}.${_CHAR} \ LANGUAGE=${_LANG} \ LC_ALL=${_LANG}_${_CNTRY}.${_CHAR} ENV S6_BEHAVIOUR_IF_STAGE2_FAILS=2 \ @@ -75,11 +75,15 @@ RUN set -e \ # Create timezone && ln -snf "/usr/share/zoneinfo/${TZ}" /etc/localtime \ && echo "${TZ}" > /etc/timezone \ -# Create folders -&& echo mkdir -p {"${APP_DIR}","${CONFIG_DIR}"} | bash \ # Create user -&& useradd -U -d "${CONFIG_DIR}" -s /bin/false -u "${PUID}" "${USER}" \ +&& useradd -U -s /bin/false -u "${PUID}" "${USER}" \ && usermod -G users "${USER}" \ +# Create folders +# && HOME_DIR=$( awk -F: -v v=$_qaz '{if ($1==v) print $6}' /etc/passwd ) \ +# && XDG_CONFIG_HOME=${CONFIG_DIR}/.config \ +# && XDG_CACHE_HOME=${CONFIG_DIR}/.cache \ +# && XDG_DATA_HOME=${CONFIG_DIR}/.local/share \ +# && echo mkdir -p {"${APP_DIR}","${CONFIG_DIR}"} | bash \ # # Clean-up #