From e50e9ac0da9200733114ee2c1cd11cdd97acf375 Mon Sep 17 00:00:00 2001 From: Bachir Soussi Chiadmi Date: Tue, 14 Jul 2020 11:48:10 +0200 Subject: [PATCH] bugfix --- Docker/client/Dockerfile | 14 +++++++------- README.md | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Docker/client/Dockerfile b/Docker/client/Dockerfile index 0741567..6d1199d 100644 --- a/Docker/client/Dockerfile +++ b/Docker/client/Dockerfile @@ -9,21 +9,21 @@ ARG UNAME=gdp ARG GID=1000 ARG GNAME=users -RUN find / -group $UID -exec chgrp -h node {} \; -RUN find / -user $UID -exec chown -h node {} \; +RUN find / -group ${UID} -exec chgrp -h node {} \; +RUN find / -user ${UID} -exec chown -h node {} \; # RUN addgroup -g 1000 gdp && \ # adduser -h /home/gdp -D -u 1000 gdp && \ -RUN adduser -u $UID -G $GNAME -s /bin/sh -D $UNAME +RUN adduser -u ${UID} -G ${GNAME} -s /bin/sh -D ${UNAME} # chown -R gdp:gdp /home/gdp -USER $UNAME +USER ${UNAME} -COPY ./bashrc /home/$UNAME/.bashrc -COPY ./inputrc /home/$UNAME/.inputrc +COPY ./bashrc /home/${UNAME}/.bashrc +COPY ./inputrc /home/${UNAME}/.inputrc COPY ./client-entrypoint.sh /usr/local/bin USER root RUN chmod +x /usr/local/bin/client-entrypoint.sh -USER $UNAME +USER ${UNAME} CMD ["/bin/sh","/usr/local/bin/client-entrypoint.sh"] diff --git a/README.md b/README.md index cac9fe0..c02ef31 100644 --- a/README.md +++ b/README.md @@ -27,7 +27,7 @@ sudo docker-compose build ``` or with args for groups and users ``` -docker build --build-arg UID=$(id -u) --build-arg GID=$(id -g) --build-arg UNAME=$(id -g) --build-arg GNAME=$(id -g) +docker-compose build --build-arg UID=$(id -u) --build-arg GID=$(id -g) --build-arg UNAME=$(id -un) --build-arg GNAME=$(id -gn) ``` ### run then each time you want to launch the app