From 6efb38d39c7a40140928810dfe16268a19134ca5 Mon Sep 17 00:00:00 2001 From: Jon Clucas Date: Fri, 14 Apr 2023 11:49:29 -0400 Subject: [PATCH] :lock: Make in-container root directory writable by all --- .../C-PAC.develop-ABCD-HCP-bionic.Dockerfile | 11 ++++++----- .../Dockerfiles/C-PAC.develop-bionic.Dockerfile | 7 ++++--- .../C-PAC.develop-fMRIPrep-LTS-xenial.Dockerfile | 15 ++++++++------- .../C-PAC.develop-lite-bionic.Dockerfile | 7 ++++--- CHANGELOG.md | 1 + 5 files changed, 23 insertions(+), 18 deletions(-) diff --git a/.github/Dockerfiles/C-PAC.develop-ABCD-HCP-bionic.Dockerfile b/.github/Dockerfiles/C-PAC.develop-ABCD-HCP-bionic.Dockerfile index 0fe6231338..971b1ea9be 100644 --- a/.github/Dockerfiles/C-PAC.develop-ABCD-HCP-bionic.Dockerfile +++ b/.github/Dockerfiles/C-PAC.develop-ABCD-HCP-bionic.Dockerfile @@ -17,11 +17,12 @@ RUN rm -Rf /code/docker_data/Dockerfiles && \ ENTRYPOINT ["/code/run-with-freesurfer.sh"] # Link libraries for Singularity images -RUN ldconfig - -RUN apt-get clean && \ - apt-get autoremove -y && \ - rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* +RUN ldconfig \ + && apt-get clean \ + && apt-get autoremove -y \ + && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* \ + && chmod 777 / \ + && chmod 777 $(ls / | grep -v sys | grep -v proc) # set user # USER c-pac_user diff --git a/.github/Dockerfiles/C-PAC.develop-bionic.Dockerfile b/.github/Dockerfiles/C-PAC.develop-bionic.Dockerfile index 751e18cfbc..91ee47cedb 100644 --- a/.github/Dockerfiles/C-PAC.develop-bionic.Dockerfile +++ b/.github/Dockerfiles/C-PAC.develop-bionic.Dockerfile @@ -17,9 +17,10 @@ RUN rm -Rf /code/docker_data/Dockerfiles && \ ENTRYPOINT ["/code/run-with-freesurfer.sh"] # link libraries & clean up -RUN rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && \ - ldconfig && \ - chmod 777 $(ls / | grep -v sys | grep -v proc) +RUN rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* \ + && ldconfig \ + && chmod 777 / \ + && chmod 777 $(ls / | grep -v sys | grep -v proc) # set user # USER c-pac_user diff --git a/.github/Dockerfiles/C-PAC.develop-fMRIPrep-LTS-xenial.Dockerfile b/.github/Dockerfiles/C-PAC.develop-fMRIPrep-LTS-xenial.Dockerfile index 600134d40e..d910c2f324 100644 --- a/.github/Dockerfiles/C-PAC.develop-fMRIPrep-LTS-xenial.Dockerfile +++ b/.github/Dockerfiles/C-PAC.develop-fMRIPrep-LTS-xenial.Dockerfile @@ -17,13 +17,14 @@ RUN rm -Rf /code/docker_data/Dockerfiles && \ ENTRYPOINT ["/code/run-with-freesurfer.sh"] # link libraries & clean up -RUN sed -i 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen && \ - locale-gen && \ - apt-get clean && \ - apt-get autoremove -y && \ - rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && \ - ldconfig && \ - chmod 777 $(ls / | grep -v sys | grep -v proc) +RUN sed -i 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen \ + && locale-gen \ + && apt-get clean \ + && apt-get autoremove -y \ + && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* \ + && ldconfig \ + && chmod 777 / \ + && chmod 777 $(ls / | grep -v sys | grep -v proc) # set user # USER c-pac_user diff --git a/.github/Dockerfiles/C-PAC.develop-lite-bionic.Dockerfile b/.github/Dockerfiles/C-PAC.develop-lite-bionic.Dockerfile index 1ad3db23ad..631f1db348 100644 --- a/.github/Dockerfiles/C-PAC.develop-lite-bionic.Dockerfile +++ b/.github/Dockerfiles/C-PAC.develop-lite-bionic.Dockerfile @@ -17,9 +17,10 @@ RUN rm -Rf /code/docker_data/Dockerfiles && \ ENTRYPOINT ["/code/run.py"] # link libraries & clean up -RUN rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && \ - ldconfig && \ - chmod 777 $(ls / | grep -v sys | grep -v proc) +RUN rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* \ + && ldconfig \ + && chmod 777 / \ + && chmod 777 $(ls / | grep -v sys | grep -v proc) # set user # USER c-pac_user diff --git a/CHANGELOG.md b/CHANGELOG.md index 4d2d4ade9a..aee5dbe87e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,6 +19,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed - Adds checksum steps to `curl`d steps in Docker build process (for standard and `lite` images) +- Makes in-container root directory writable by all ### Added dependency