From 486f90a7f777edc9d3303c82960144b7f86be5d0 Mon Sep 17 00:00:00 2001 From: Ben Sturmfels Date: Tue, 14 Apr 2020 16:40:38 +1000 Subject: [PATCH] Remove "git submodule init && git submodule update" from Dockerfiles. These commands are run by `bootstrap.sh`. Also includes a couple more tidy-ups. --- Dockerfile-debian-python2-sqlite | 4 +--- Dockerfile-debian-python3-sqlite | 8 +++----- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/Dockerfile-debian-python2-sqlite b/Dockerfile-debian-python2-sqlite index 82e91bc8..5cabef0f 100644 --- a/Dockerfile-debian-python2-sqlite +++ b/Dockerfile-debian-python2-sqlite @@ -48,16 +48,14 @@ RUN mkdir /opt/mediagoblin RUN chown -R www-data:www-data /opt/mediagoblin WORKDIR /opt/mediagoblin -RUN mkdir /var/www +RUN mkdir --mode=g+w /var/www RUN chown root:www-data /var/www -RUN chmod g+w /var/www RUN groupadd --system mediagoblin --gid 1024 && adduser www-data mediagoblin USER www-data RUN git clone --depth=1 git://git.savannah.gnu.org/mediagoblin.git -b master . -RUN git submodule init && git submodule update RUN ./bootstrap.sh RUN VIRTUALENV_FLAGS='--system-site-packages' ./configure diff --git a/Dockerfile-debian-python3-sqlite b/Dockerfile-debian-python3-sqlite index 0960bf12..064d29e6 100644 --- a/Dockerfile-debian-python3-sqlite +++ b/Dockerfile-debian-python3-sqlite @@ -6,8 +6,8 @@ # # To build this Docker image, run: # -# docker build -t mediagoblin-python3 -f Dockerfile-python3 # or -# docker build -t mediagoblin-python3 - < Dockerfile-python3 # with no build context +# docker build -t mediagoblin-python3 -f Dockerfile-debian-python3-sqlite # or +# docker build -t mediagoblin-python3 - < Dockerfile-debian-python3-sqlite # with no build context # # The "- < Dockerfile" format advises Docker not to include the current # directory as build context. @@ -94,9 +94,8 @@ WORKDIR /opt/mediagoblin # Create /var/www because Bower writes some cache files into /var/www during # make, failing if it doesn't exist. -RUN mkdir /var/www +RUN mkdir --mode=g+w /var/www RUN chown root:www-data /var/www -RUN chmod g+w /var/www # Set up custom group to align with volume permissions for mounted # "mediagoblin/mediagoblin" and "mediagoblin/user_dev". @@ -127,7 +126,6 @@ USER www-data # database type. So instead we're doing a git clone. We could potentially use # `git archive` but this still wouldn't account for the submodules. RUN git clone --depth=1 git://git.savannah.gnu.org/mediagoblin.git -b master . -RUN git submodule init && git submodule update RUN ./bootstrap.sh RUN VIRTUALENV_FLAGS='--system-site-packages' ./configure --with-python3 -- 2.25.1