From 5ea68f79b4d382ef47a81bcf84a748c4227f1a6d Mon Sep 17 00:00:00 2001 From: zeus Date: Wed, 15 Nov 2023 13:07:35 +0200 Subject: [PATCH] xelatex-base --- .../usr/share/swarmlab.io/sec/swarmlab-sec | 41 +++++++++++++------ 1 file changed, 28 insertions(+), 13 deletions(-) diff --git a/install/usr/share/swarmlab.io/sec/swarmlab-sec b/install/usr/share/swarmlab.io/sec/swarmlab-sec index 3390ad6..3ca829b 100755 --- a/install/usr/share/swarmlab.io/sec/swarmlab-sec +++ b/install/usr/share/swarmlab.io/sec/swarmlab-sec @@ -152,12 +152,20 @@ if [ -d "$Wdir/project" ]; then COPY $hostnames /usr/bin COPY install-vim-plugin.sh . - RUN export DEBIAN_FRONTEND=noninteractive \ - && addgroup -S docker && adduser -S docker -G docker \ - && echo 'root:$ROOT_PASSWORD' | chpasswd \ - && mkdir -p /home/docker/project \ - && echo "docker:docker" | chpasswd \ - && chown -R \${USER1}:\${USER1} \${SSHDIR} +ENV USER=docker +ENV GROUP_NAME=docker +ENV UID=12345 +ENV GID=23456 + +RUN export DEBIAN_FRONTEND=noninteractive \ + && addgroup -g $GID $GROUP_NAME \ + && adduser \ + --disabled-password \ + --gecos "" \ + --home "/home/docker" \ + --ingroup "$GROUP_NAME" \ + --uid "$UID" \ + "$USER" CMD ["tail","-f","/dev/null"] @@ -219,13 +227,20 @@ if [ "$Wdir" == "$HOME" ]; then COPY $hostnames /usr/bin COPY install-vim-plugin.sh . - RUN export DEBIAN_FRONTEND=noninteractive \ - && addgroup -S docker && adduser -S docker -G docker \ - && echo 'root:$ROOT_PASSWORD' | chpasswd \ - && mkdir -p /home/docker/project \ - && echo "docker:docker" | chpasswd \ - && chown -R \${USER1}:\${USER1} \${SSHDIR} - +ENV USER=docker +ENV GROUP_NAME=docker +ENV UID=12345 +ENV GID=23456 + +RUN export DEBIAN_FRONTEND=noninteractive \ + && addgroup -g $GID $GROUP_NAME \ + && adduser \ + --disabled-password \ + --gecos "" \ + --home "/home/docker" \ + --ingroup "$GROUP_NAME" \ + --uid "$UID" \ + "$USER" CMD ["tail","-f","/dev/null"]