From e0cb0c1f5dc4ba4353233118cb25a4f4c0d4d1f8 Mon Sep 17 00:00:00 2001 From: cytopia Date: Sun, 3 Jul 2022 12:41:21 +0200 Subject: [PATCH] Adjust permission during build time instead of run-time --- Dockerfiles/base/data/docker-entrypoint.d/101-uid-gid.sh | 6 ------ Dockerfiles/work/Dockerfile-5.2 | 4 ++++ Dockerfiles/work/Dockerfile-5.3 | 4 ++++ Dockerfiles/work/Dockerfile-5.4 | 4 ++++ Dockerfiles/work/Dockerfile-5.5 | 4 ++++ Dockerfiles/work/Dockerfile-5.6 | 4 ++++ Dockerfiles/work/Dockerfile-7.0 | 4 ++++ Dockerfiles/work/Dockerfile-7.1 | 4 ++++ Dockerfiles/work/Dockerfile-7.2 | 4 ++++ Dockerfiles/work/Dockerfile-7.3 | 4 ++++ Dockerfiles/work/Dockerfile-7.4 | 4 ++++ Dockerfiles/work/Dockerfile-8.0 | 4 ++++ Dockerfiles/work/Dockerfile-8.1 | 4 ++++ Dockerfiles/work/Dockerfile-8.2 | 4 ++++ build/ansible/group_vars/all/work.yml | 4 ++++ 15 files changed, 56 insertions(+), 6 deletions(-) diff --git a/Dockerfiles/base/data/docker-entrypoint.d/101-uid-gid.sh b/Dockerfiles/base/data/docker-entrypoint.d/101-uid-gid.sh index d889c763..3203fec1 100755 --- a/Dockerfiles/base/data/docker-entrypoint.d/101-uid-gid.sh +++ b/Dockerfiles/base/data/docker-entrypoint.d/101-uid-gid.sh @@ -72,9 +72,6 @@ set_uid() { if [ -d "/etc/supervisor/custom.d" ]; then run "chown -R ${username} /etc/supervisor/custom.d" "${debug}" fi - if [ -d "/opt/nvm" ]; then - run "chown -R ${username} /opt/nvm" "${debug}" - fi fi fi } @@ -125,9 +122,6 @@ set_gid() { if [ -d "/etc/supervisor/custom.d" ]; then run "chown -R :${groupname} /etc/supervisor/custom.d" "${debug}" fi - if [ -d "/opt/nvm" ]; then - run "chown -R :${groupname} /opt/nvm" "${debug}" - fi fi fi } diff --git a/Dockerfiles/work/Dockerfile-5.2 b/Dockerfiles/work/Dockerfile-5.2 index c9a195f1..224f4183 100644 --- a/Dockerfiles/work/Dockerfile-5.2 +++ b/Dockerfiles/work/Dockerfile-5.2 @@ -171,6 +171,10 @@ RUN set -eux \ && su -c '. /opt/nvm/nvm.sh; nvm install --lts' devilbox \ && su -c '. /opt/nvm/nvm.sh; nvm use --lts' devilbox \ && su -c '. /opt/nvm/nvm.sh; corepack enable' devilbox \ +\ +&& chmod 0777 /opt/nvm \ +&& find /opt/nvm -type f -print0 | xargs -n1 -0 chmod go+w \ +&& find /opt/nvm -type d -print0 | xargs -n1 -0 chmod 0777 \ \ \ # -------------------- pgsql_client -------------------- diff --git a/Dockerfiles/work/Dockerfile-5.3 b/Dockerfiles/work/Dockerfile-5.3 index e1a4b996..1e6d6f6c 100644 --- a/Dockerfiles/work/Dockerfile-5.3 +++ b/Dockerfiles/work/Dockerfile-5.3 @@ -183,6 +183,10 @@ RUN set -eux \ && su -c '. /opt/nvm/nvm.sh; nvm install --lts' devilbox \ && su -c '. /opt/nvm/nvm.sh; nvm use --lts' devilbox \ && su -c '. /opt/nvm/nvm.sh; corepack enable' devilbox \ +\ +&& chmod 0777 /opt/nvm \ +&& find /opt/nvm -type f -print0 | xargs -n1 -0 chmod go+w \ +&& find /opt/nvm -type d -print0 | xargs -n1 -0 chmod 0777 \ \ \ # -------------------- pgsql_client -------------------- diff --git a/Dockerfiles/work/Dockerfile-5.4 b/Dockerfiles/work/Dockerfile-5.4 index d65d86c5..85b5c80b 100644 --- a/Dockerfiles/work/Dockerfile-5.4 +++ b/Dockerfiles/work/Dockerfile-5.4 @@ -183,6 +183,10 @@ RUN set -eux \ && su -c '. /opt/nvm/nvm.sh; nvm install --lts' devilbox \ && su -c '. /opt/nvm/nvm.sh; nvm use --lts' devilbox \ && su -c '. /opt/nvm/nvm.sh; corepack enable' devilbox \ +\ +&& chmod 0777 /opt/nvm \ +&& find /opt/nvm -type f -print0 | xargs -n1 -0 chmod go+w \ +&& find /opt/nvm -type d -print0 | xargs -n1 -0 chmod 0777 \ \ \ # -------------------- pgsql_client -------------------- diff --git a/Dockerfiles/work/Dockerfile-5.5 b/Dockerfiles/work/Dockerfile-5.5 index ab687242..e148e0e5 100644 --- a/Dockerfiles/work/Dockerfile-5.5 +++ b/Dockerfiles/work/Dockerfile-5.5 @@ -183,6 +183,10 @@ RUN set -eux \ && su -c '. /opt/nvm/nvm.sh; nvm install --lts' devilbox \ && su -c '. /opt/nvm/nvm.sh; nvm use --lts' devilbox \ && su -c '. /opt/nvm/nvm.sh; corepack enable' devilbox \ +\ +&& chmod 0777 /opt/nvm \ +&& find /opt/nvm -type f -print0 | xargs -n1 -0 chmod go+w \ +&& find /opt/nvm -type d -print0 | xargs -n1 -0 chmod 0777 \ \ \ # -------------------- pgsql_client -------------------- diff --git a/Dockerfiles/work/Dockerfile-5.6 b/Dockerfiles/work/Dockerfile-5.6 index 8ae79e5b..a168b276 100644 --- a/Dockerfiles/work/Dockerfile-5.6 +++ b/Dockerfiles/work/Dockerfile-5.6 @@ -185,6 +185,10 @@ RUN set -eux \ && su -c '. /opt/nvm/nvm.sh; nvm install --lts' devilbox \ && su -c '. /opt/nvm/nvm.sh; nvm use --lts' devilbox \ && su -c '. /opt/nvm/nvm.sh; corepack enable' devilbox \ +\ +&& chmod 0777 /opt/nvm \ +&& find /opt/nvm -type f -print0 | xargs -n1 -0 chmod go+w \ +&& find /opt/nvm -type d -print0 | xargs -n1 -0 chmod 0777 \ \ \ # -------------------- pgsql_client -------------------- diff --git a/Dockerfiles/work/Dockerfile-7.0 b/Dockerfiles/work/Dockerfile-7.0 index 1bc83d8c..baf9ed0d 100644 --- a/Dockerfiles/work/Dockerfile-7.0 +++ b/Dockerfiles/work/Dockerfile-7.0 @@ -185,6 +185,10 @@ RUN set -eux \ && su -c '. /opt/nvm/nvm.sh; nvm install --lts' devilbox \ && su -c '. /opt/nvm/nvm.sh; nvm use --lts' devilbox \ && su -c '. /opt/nvm/nvm.sh; corepack enable' devilbox \ +\ +&& chmod 0777 /opt/nvm \ +&& find /opt/nvm -type f -print0 | xargs -n1 -0 chmod go+w \ +&& find /opt/nvm -type d -print0 | xargs -n1 -0 chmod 0777 \ \ \ # -------------------- pgsql_client -------------------- diff --git a/Dockerfiles/work/Dockerfile-7.1 b/Dockerfiles/work/Dockerfile-7.1 index 539fd3af..25b81040 100644 --- a/Dockerfiles/work/Dockerfile-7.1 +++ b/Dockerfiles/work/Dockerfile-7.1 @@ -184,6 +184,10 @@ RUN set -eux \ && su -c '. /opt/nvm/nvm.sh; nvm install --lts' devilbox \ && su -c '. /opt/nvm/nvm.sh; nvm use --lts' devilbox \ && su -c '. /opt/nvm/nvm.sh; corepack enable' devilbox \ +\ +&& chmod 0777 /opt/nvm \ +&& find /opt/nvm -type f -print0 | xargs -n1 -0 chmod go+w \ +&& find /opt/nvm -type d -print0 | xargs -n1 -0 chmod 0777 \ \ \ # -------------------- pgsql_client -------------------- diff --git a/Dockerfiles/work/Dockerfile-7.2 b/Dockerfiles/work/Dockerfile-7.2 index a0667b77..4cb98c2d 100644 --- a/Dockerfiles/work/Dockerfile-7.2 +++ b/Dockerfiles/work/Dockerfile-7.2 @@ -184,6 +184,10 @@ RUN set -eux \ && su -c '. /opt/nvm/nvm.sh; nvm install --lts' devilbox \ && su -c '. /opt/nvm/nvm.sh; nvm use --lts' devilbox \ && su -c '. /opt/nvm/nvm.sh; corepack enable' devilbox \ +\ +&& chmod 0777 /opt/nvm \ +&& find /opt/nvm -type f -print0 | xargs -n1 -0 chmod go+w \ +&& find /opt/nvm -type d -print0 | xargs -n1 -0 chmod 0777 \ \ \ # -------------------- pgsql_client -------------------- diff --git a/Dockerfiles/work/Dockerfile-7.3 b/Dockerfiles/work/Dockerfile-7.3 index 29472098..1b8cc9a0 100644 --- a/Dockerfiles/work/Dockerfile-7.3 +++ b/Dockerfiles/work/Dockerfile-7.3 @@ -185,6 +185,10 @@ RUN set -eux \ && su -c '. /opt/nvm/nvm.sh; nvm install --lts' devilbox \ && su -c '. /opt/nvm/nvm.sh; nvm use --lts' devilbox \ && su -c '. /opt/nvm/nvm.sh; corepack enable' devilbox \ +\ +&& chmod 0777 /opt/nvm \ +&& find /opt/nvm -type f -print0 | xargs -n1 -0 chmod go+w \ +&& find /opt/nvm -type d -print0 | xargs -n1 -0 chmod 0777 \ \ \ # -------------------- pgsql_client -------------------- diff --git a/Dockerfiles/work/Dockerfile-7.4 b/Dockerfiles/work/Dockerfile-7.4 index c06b77b5..fdd3b05c 100644 --- a/Dockerfiles/work/Dockerfile-7.4 +++ b/Dockerfiles/work/Dockerfile-7.4 @@ -185,6 +185,10 @@ RUN set -eux \ && su -c '. /opt/nvm/nvm.sh; nvm install --lts' devilbox \ && su -c '. /opt/nvm/nvm.sh; nvm use --lts' devilbox \ && su -c '. /opt/nvm/nvm.sh; corepack enable' devilbox \ +\ +&& chmod 0777 /opt/nvm \ +&& find /opt/nvm -type f -print0 | xargs -n1 -0 chmod go+w \ +&& find /opt/nvm -type d -print0 | xargs -n1 -0 chmod 0777 \ \ \ # -------------------- pgsql_client -------------------- diff --git a/Dockerfiles/work/Dockerfile-8.0 b/Dockerfiles/work/Dockerfile-8.0 index 8b059cb7..a29639f3 100644 --- a/Dockerfiles/work/Dockerfile-8.0 +++ b/Dockerfiles/work/Dockerfile-8.0 @@ -185,6 +185,10 @@ RUN set -eux \ && su -c '. /opt/nvm/nvm.sh; nvm install --lts' devilbox \ && su -c '. /opt/nvm/nvm.sh; nvm use --lts' devilbox \ && su -c '. /opt/nvm/nvm.sh; corepack enable' devilbox \ +\ +&& chmod 0777 /opt/nvm \ +&& find /opt/nvm -type f -print0 | xargs -n1 -0 chmod go+w \ +&& find /opt/nvm -type d -print0 | xargs -n1 -0 chmod 0777 \ \ \ # -------------------- pgsql_client -------------------- diff --git a/Dockerfiles/work/Dockerfile-8.1 b/Dockerfiles/work/Dockerfile-8.1 index f97c5583..57c4b0a0 100644 --- a/Dockerfiles/work/Dockerfile-8.1 +++ b/Dockerfiles/work/Dockerfile-8.1 @@ -185,6 +185,10 @@ RUN set -eux \ && su -c '. /opt/nvm/nvm.sh; nvm install --lts' devilbox \ && su -c '. /opt/nvm/nvm.sh; nvm use --lts' devilbox \ && su -c '. /opt/nvm/nvm.sh; corepack enable' devilbox \ +\ +&& chmod 0777 /opt/nvm \ +&& find /opt/nvm -type f -print0 | xargs -n1 -0 chmod go+w \ +&& find /opt/nvm -type d -print0 | xargs -n1 -0 chmod 0777 \ \ \ # -------------------- pgsql_client -------------------- diff --git a/Dockerfiles/work/Dockerfile-8.2 b/Dockerfiles/work/Dockerfile-8.2 index 7046938a..4a2508dd 100644 --- a/Dockerfiles/work/Dockerfile-8.2 +++ b/Dockerfiles/work/Dockerfile-8.2 @@ -185,6 +185,10 @@ RUN set -eux \ && su -c '. /opt/nvm/nvm.sh; nvm install --lts' devilbox \ && su -c '. /opt/nvm/nvm.sh; nvm use --lts' devilbox \ && su -c '. /opt/nvm/nvm.sh; corepack enable' devilbox \ +\ +&& chmod 0777 /opt/nvm \ +&& find /opt/nvm -type f -print0 | xargs -n1 -0 chmod go+w \ +&& find /opt/nvm -type d -print0 | xargs -n1 -0 chmod 0777 \ \ \ # -------------------- pgsql_client -------------------- diff --git a/build/ansible/group_vars/all/work.yml b/build/ansible/group_vars/all/work.yml index a1452fda..08315ea2 100644 --- a/build/ansible/group_vars/all/work.yml +++ b/build/ansible/group_vars/all/work.yml @@ -706,6 +706,10 @@ software_available: su -c '. {{ nvm_home }}/nvm.sh; nvm install {{ node_version }}' devilbox \ && su -c '. {{ nvm_home }}/nvm.sh; nvm use {{ node_version }}' devilbox \ && su -c '. {{ nvm_home }}/nvm.sh; corepack enable' devilbox \ + \ + && chmod 0777 {{ nvm_home }} \ + && find {{ nvm_home }} -type f -print0 | xargs -n1 -0 chmod go+w \ + && find {{ nvm_home }} -type d -print0 | xargs -n1 -0 chmod 0777 \ ### ### PostgrSQL Command line client ###