Tweak test/docker setup

Author: jpadilla

Dockerfile.worker DockerfileDockerfile.worker renamed to Dockerfile

@@ -21,6 +21,8 @@ RUN apt-get update && \
 
 FROM python:3.7
 
+ARG PIPENV_ARGS
+
 ENV LANG en_US.utf8
 
 RUN pip install pipenv==2018.11.26
@@ -31,7 +33,7 @@ COPY --from=builder /tmp/poppler/bin/pdftotext /usr/local/bin/
 COPY Pipfile Pipfile.lock /app/
 
 # Install application requirements
-RUN pipenv install --deploy --system && \
+RUN pipenv install --deploy --system $PIPENV_ARGS && \
     rm -rf /root/.cache
 
 # Bundle app source

Dockerfile.local

@@ -34,8 +34,8 @@ case "$1" in
     ./bin/worker --loglevel=DEBUG --concurrency=2
     ;;
 
-  "start-test")
-    pipenv run pytest
+  "run-tests")
+    pytest
     ;;
 
   *)

Dockerfile.web

@@ -237,6 +237,13 @@ def CACHES(self):
             }
         }
 
+    class Testing(Common):
+        PASSWORD_HASHERS = ["django.contrib.auth.hashers.MD5PasswordHasher"]
+
+        CELERY_TASK_IGNORE_RESULT = True
+        CELERY_TASK_ALWAYS_EAGER = True
+        CELERY_TASK_EAGER_PROPAGATES = True
+
 
 structlog.configure(
     processors=[

bin/docker-entrypoint

@@ -24,7 +24,9 @@ services:
   worker:
     build:
       context: .
-      dockerfile: Dockerfile.worker
+      dockerfile: Dockerfile
+      args:
+        PIPENV_ARGS: --dev
     command: start-worker
     entrypoint: /app/bin/docker-entrypoint
     restart: on-failure
@@ -39,7 +41,9 @@ services:
   web:
     build:
       context: .
-      dockerfile: Dockerfile.web
+      dockerfile: Dockerfile
+      args:
+        PIPENV_ARGS: --dev
     command: start-web
     entrypoint: /app/bin/docker-entrypoint
     restart: on-failure
@@ -58,18 +62,18 @@ services:
       timeout: 10s
       retries: 3
 
-  test:
+  tests:
     build:
       context: .
-      dockerfile: Dockerfile.local
-    command: start-test
+      dockerfile: Dockerfile
+      args:
+        PIPENV_ARGS: --dev
+    command: run-tests
     entrypoint: /app/bin/docker-entrypoint
     env_file:
       - .env
     volumes:
       - .:/app
-    ports:
-      - '8000:8000'
     links:
       - database:database
-      - redis:redis
+      - redis:redis

contratospr/settings.py

@@ -1,7 +1,7 @@
 build:
   docker:
-    web: Dockerfile.web
-    worker: Dockerfile.worker
+    web: Dockerfile
+    worker: Dockerfile
 release:
   image: web
   command:

docker-compose.yml

@@ -0,0 +1,2 @@
+[pytest]
+DJANGO_CONFIGURATION=Testing