Revert "Merge pull request #3055 from tooboredtocode/develop"

This reverts commit d766927, reversing
changes made to 4293ec7.

Dockerfile

@@ -6,8 +6,6 @@ RUN apk add --no-cache postgresql-libs postgresql-client gettext zlib libjpeg li
 #Print all logs without buffering it.
 ENV PYTHONUNBUFFERED 1
 
-ENV DOCKER true
-
 #This port will be used by gunicorn.
 EXPOSE 8080
 
@@ -35,12 +33,6 @@ RUN apk add --no-cache --virtual .build-deps gcc musl-dev postgresql-dev zlib-de
 #Copy project and execute it.
 COPY . ./
 
-# collect the static files
-RUN /opt/recipes/venv/bin/python manage.py collectstatic_js_reverse
-RUN /opt/recipes/venv/bin/python manage.py collectstatic --noinput
-# copy the collected static files to a different location, so they can be moved into a potentially mounted volume
-RUN mv /opt/recipes/staticfiles /opt/recipes/staticfiles-collect
-
 # collect information from git repositories
 RUN /opt/recipes/venv/bin/python version.py
 # delete git repositories to reduce image size

boot.sh

@@ -67,21 +67,12 @@ echo "Migrating database"
 
 python manage.py migrate
 
-if [[ "${DOCKER}" == "true" ]]; then
-    echo "Copying cached static files from docker build"
+echo "Generating static files"
 
-    mkdir -p /opt/recipes/staticfiles
-    rm -rf /opt/recipes/staticfiles/*
-    mv /opt/recipes/staticfiles-collect/* /opt/recipes/staticfiles
-    rm -rf /opt/recipes/staticfiles-collect
-else
-    echo "Collecting static files, this may take a while..."
-
-    python manage.py collectstatic_js_reverse
-    python manage.py collectstatic --noinput
+python manage.py collectstatic_js_reverse
+python manage.py collectstatic --noinput
 
-    echo "Done"
-fi
+echo "Done"
 
 chmod -R 755 /opt/recipes/mediafiles