Remove "git submodule init && git submodule update" from Dockerfiles.

These commands are run by `bootstrap.sh`. Also includes a couple more tidy-ups.

diff --git a/Dockerfile-debian-python2-sqlite b/Dockerfile-debian-python2-sqlite
index 82e91bc86393ab33307ea6ae8babaa0abef92311..5cabef0fef8fa6d45d3a325ba28e78ed86611554 100644 (file)
--- 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 0960bf120cf9a3d76be901d288b9c3201118362a..064d29e67d26a9a13b2eebc93fe5890dd7b6aa98 100644 (file)
--- 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