heckyel/mediagoblin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
These commands are run by `bootstrap.sh`. Also includes a couple more tidy-ups.
This commit is contained in:
Ben Sturmfels 2020-04-14 16:40:38 +10:00
parent 72047cbe68
commit 486f90a7f7
No known key found for this signature in database
GPG Key ID: 023C05E2C9C068F0
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Dockerfile-debian-python2-sqlite
View File

@ -48,16 +48,14 @@ RUN mkdir /opt/mediagoblin
RUN chown -R www-data:www-data /opt/mediagoblin RUN chown -R www-data:www-data /opt/mediagoblin
WORKDIR /opt/mediagoblin WORKDIR /opt/mediagoblin
RUN mkdir /var/www RUN mkdir --mode=g+w /var/www
RUN chown root:www-data /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 RUN groupadd --system mediagoblin --gid 1024 && adduser www-data mediagoblin
USER www-data USER www-data
RUN git clone --depth=1 git://git.savannah.gnu.org/mediagoblin.git -b master . 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 ./bootstrap.sh
RUN VIRTUALENV_FLAGS='--system-site-packages' ./configure RUN VIRTUALENV_FLAGS='--system-site-packages' ./configure

8
Dockerfile-debian-python3-sqlite
View File

@ -6,8 +6,8 @@
# #
# To build this Docker image, run: # To build this Docker image, run:
# #
# docker build -t mediagoblin-python3 -f Dockerfile-python3 # or # docker build -t mediagoblin-python3 -f Dockerfile-debian-python3-sqlite # or
# docker build -t mediagoblin-python3 - < Dockerfile-python3 # with no build context # docker build -t mediagoblin-python3 - < Dockerfile-debian-python3-sqlite # with no build context
# #
# The "- < Dockerfile" format advises Docker not to include the current # The "- < Dockerfile" format advises Docker not to include the current
# directory as build context. # directory as build context.
@ -94,9 +94,8 @@ WORKDIR /opt/mediagoblin
# Create /var/www because Bower writes some cache files into /var/www during # Create /var/www because Bower writes some cache files into /var/www during
# make, failing if it doesn't exist. # 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 chown root:www-data /var/www
RUN chmod g+w /var/www
# Set up custom group to align with volume permissions for mounted # Set up custom group to align with volume permissions for mounted
# "mediagoblin/mediagoblin" and "mediagoblin/user_dev". # "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 # 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. # `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 clone --depth=1 git://git.savannah.gnu.org/mediagoblin.git -b master .
RUN git submodule init && git submodule update
RUN ./bootstrap.sh RUN ./bootstrap.sh
RUN VIRTUALENV_FLAGS='--system-site-packages' ./configure --with-python3 RUN VIRTUALENV_FLAGS='--system-site-packages' ./configure --with-python3