Changed Docker file

Author: phpusr

.dockerignore

@@ -3,14 +3,14 @@
 /.git/
 __pycache__/
 
-/data/
+/data/pgdata
 /scripts/
 /static/
 
 /.dockerignore
 /.gitignore
 /docker-compose.yml
 /Dockerfile
-/Pipfile.lock
+/Pipfile
 /Procfile
 /Makefile

Dockerfile

@@ -5,12 +5,23 @@ ENV DEBUG False
 
 WORKDIR /app/
 
-COPY Pipfile /app/Pipfile
-RUN pip install --upgrade pipenv && pipenv install
+# Install dependencies
+COPY Pipfile.lock ./
+RUN pip install --upgrade pipenv \
+    && pipenv requirements > requirements.txt \
+    && pip install -r requirements.txt \
+    && pip uninstall -y pipenv \
+    && rm Pipfile.lock requirements.txt \
+    && mkdir data
 
+# Copy source files
 COPY . /app/
-RUN pipenv run ./manage.py collectstatic
+RUN ./manage.py collectstatic
+
+# Add user
+RUN useradd user
+USER user
 
 EXPOSE 8000
-ENTRYPOINT pipenv run ./manage.py migrate \
-            && pipenv run gunicorn app.wsgi:application --bind 0.0.0.0:8000 --workers 1
+ENTRYPOINT ./manage.py migrate \
+            && gunicorn app.wsgi:application --bind 0.0.0.0:8000 --workers 1

Makefile

@@ -21,7 +21,7 @@ dumpdata:
 loaddata:
 	@echo "=== Restoring $(PROD_DB_URL) ==="
 	@pipenv run ./manage.py flush
-	@pipenv run ./manage.py loaddata $(BACKUP_JSON_FILE)
+	@pipenv run ./manage.py loaddata $(BACKUP_JSON_FILE) -e contenttypes.contenttype -e auth.permission -e admin
 
 ## pg_dump