HOTFIX: Fix deployment (#208)

.dockerignore

@@ -6,6 +6,8 @@ docker-compose.yml
 docker-compose-prod.yml
 .travis.yml
 
+.env.template
+.env
 .envrc
 creds.txt
 

Makefile

@@ -1,4 +1,4 @@
-.PHONY: help
+.PHONY: help logs
 
 help: ## This help
 	@echo "Makefile for managing application:\n"
@@ -63,9 +63,8 @@ test-skipvcr: ## run non-vcr tests
 lint: ## run flake8 linter
 	docker-compose exec app flake8
 
-.PHONY: logs
 logs: ## attach to logs
-	docker logs `docker-compose ps -q app`
+	docker-compose logs
 
 debug: ## attach to app container for debugging
 	docker attach `docker-compose ps -q app`
@@ -113,3 +112,7 @@ prod-shell:  ## shell into production container
 
 prod-shell-db:  ## shell into prodution postgres instance
 	psql -d "${DATABASE_URI}"
+
+prod-logs: ## attach to logs in production container
+	docker-compose -f docker-compose.prod.yml logs
+

docker/dev/Dockerfile

@@ -8,11 +8,6 @@ ENV PYTHONUNBUFFERED 1
 
 WORKDIR /app
 
-RUN groupadd -g 901 -r busybeaverdev \
-    && useradd -g busybeaverdev -r -u 901 busybeaver_user \
-    && mkdir /app/logs /home/busybeaver_user \
-    && chmod -R 777 /app/logs /home/busybeaver_user
-
 COPY requirements.txt requirements_dev.txt /tmp/
 RUN pip install --no-cache-dir -r /tmp/requirements_dev.txt
 
@@ -21,6 +16,10 @@ EXPOSE 5000
 COPY ./ /app
 
 # Switch from root user for security
-USER busybeaverdev
+RUN groupadd -g 901 -r busybeaverdev \
+    && useradd -g busybeaverdev -r -u 901 busybeaver_user \
+    && mkdir /app/logs /home/busybeaver_user \
+    && chmod -R 777 /app/logs /home/busybeaver_user
+USER busybeaver_user
 
 ENTRYPOINT [ "scripts/entrypoint.sh" ]

docker/prod/Dockerfile

@@ -8,11 +8,6 @@ ENV PYTHONUNBUFFERED 1
 
 WORKDIR /app
 
-RUN groupadd -g 901 -r busybeaverdev \
-    && useradd -g busybeaverdev -r -u 901 busybeaver_user \
-    && mkdir /app/logs /home/busybeaver_user \
-    && chmod -R 777 /app/logs /home/busybeaver_user
-
 COPY requirements.txt /tmp/
 RUN pip install --no-cache-dir -r /tmp/requirements.txt
 
@@ -21,6 +16,10 @@ EXPOSE 5000
 COPY ./ /app
 
 # Switch from root user for security
+RUN groupadd -g 901 -r busybeaverdev \
+    && useradd -g busybeaverdev -r -u 901 busybeaver_user \
+    && mkdir /app/logs /home/busybeaver_user \
+    && chmod -R 777 /app/logs /home/busybeaver_user
 USER busybeaver_user
 
 ENTRYPOINT [ "scripts/entrypoint.sh" ]