Docker infrastructure for new redis event listener container

hjwp · hjwp · commit 8ba2a1b441f8 · 2019-07-26T15:31:11.000+01:00
diff --git a/Dockerfile b/Dockerfile
@@ -14,5 +14,3 @@ RUN pip install -e /src
 COPY tests/ /tests/
 
 WORKDIR /src
-ENV FLASK_APP=allocation/flask_app.py FLASK_DEBUG=1 PYTHONUNBUFFERED=1
-CMD flask run --host=0.0.0.0 --port=80
diff --git a/Makefile b/Makefile
@@ -1,25 +1,25 @@
 build:
 	docker-compose build
 
-api:
-	docker-compose up -d app
+services:
+	docker-compose up -d
 
 test:
-	docker-compose run --rm --entrypoint='pytest /tests' app
+	docker-compose run --rm --entrypoint='pytest /tests' api
 
 unit-tests:
-	docker-compose run --rm --entrypoint='pytest /tests/unit' app
+	docker-compose run --rm --entrypoint='pytest /tests/unit' api
 
 integration-tests:
-	docker-compose run --rm --entrypoint='pytest /tests/integration' app
+	docker-compose run --rm --entrypoint='pytest /tests/integration' api
 
 e2e-tests:
-	docker-compose run --rm --entrypoint='pytest /tests/e2e' app
+	docker-compose run --rm --entrypoint='pytest /tests/e2e' api
 
 logs:
-	docker-compose logs app | tail -100
+	docker-compose logs --tail=25 api redis_pubsub
 
 down:
 	docker-compose down --remove-orphans
 
-all: down build api test
+all: down build services test
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,25 +1,51 @@
 version: "3"
+
 services:
 
-  app:
+  redis_pubsub:
     build:
       context: .
       dockerfile: Dockerfile
+    image: allocation-image
     depends_on:
       - postgres
       - redis
     environment:
       - DB_HOST=postgres
       - DB_PASSWORD=abc123
-      - API_HOST=app
+      - REDIS_HOST=redis
       - PYTHONDONTWRITEBYTECODE=1
     volumes:
       - ./src:/src
       - ./tests:/tests
+    entrypoint:
+      - python
+      - /src/allocation/redis_pubsub.py
+
+  api:
+    image: allocation-image
+    depends_on:
+      - redis_pubsub
+    environment:
+      - DB_HOST=postgres
+      - DB_PASSWORD=abc123
+      - API_HOST=api
+      - REDIS_HOST=redis
+      - PYTHONDONTWRITEBYTECODE=1
+      - FLASK_APP=allocation/flask_app.py
+      - FLASK_DEBUG=1
+      - PYTHONUNBUFFERED=1
+    volumes:
+      - ./src:/src
+      - ./tests:/tests
+    entrypoint:
+      - flask
+      - run
+      - --host=0.0.0.0
+      - --port=80
     ports:
       - "5005:80"
 
-
   postgres:
     image: postgres:9.6
     environment:
