fix: Add missing celery requirement to dev docker-compose (#54)

* fix: Add missing celery requirement to dev docker-compose * fix: Reverse proxy proxy_pass typo fixed
wearefrank · Feb 23, 2023 · 8c6cf91 · 8c6cf91
1 parent 9d3b343
commit 8c6cf91
Show file tree

Hide file tree

Showing 2 changed files with 61 additions and 27 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,14 +1,10 @@
-# This is a compose file inteded for trying out the project locally and absolutely
-# not suitable for production usage. The configuration here contains non-safe defaults.
-#
-# If you want to try out CMIS with Alfresco, see docker-compose.alfresco.yml
-#
-#       
-#     command: postgres -c max_connections=300 -c log_min_messages=LOG -c log_statement=all
 version: '4'
 
 services:
-  postgis:
+  open-zaak-redis:
+    image: redis
+
+  open-zaak-db:
     image: mdillon/postgis
     environment:
       - POSTGRES_HOST_AUTH_METHOD=trust
@@ -18,50 +14,80 @@ services:
     ports:
       - "11234:5432"
 
-  redis:
-    image: redis
-
   open-zaak:
     image: openzaak/open-zaak:latest
-    environment: &app-env
+    container_name: open-zaak
+    environment: &openzaak-env
       - DJANGO_SETTINGS_MODULE=openzaak.conf.docker
-      - OPENZAAK_DOMAIN=localhost
-      - OPENZAAK_REWRITE_HOST=TRUE
+      - OPENZAAK_DOMAIN=host.docker.internal:8000
       - SECRET_KEY=${SECRET_KEY:-7(h1r2hk)8z9+05edulo_3qzymwbo&c24=)qz7+_@3&2sp=u%i}
       - DB_NAME=openzaak
       - DB_USER=openzaak
-      - DB_HOST=postgis
+      - DB_HOST=open-zaak-db
       - IS_HTTPS=no
       - ALLOWED_HOSTS=*
-      - CACHE_DEFAULT=redis:6379/0
-      - CACHE_AXES=redis:6379/0
+      - CACHE_DEFAULT=open-zaak-redis:6379/0
+      - CACHE_AXES=open-zaak-redis:6379/0
       - SUBPATH=${SUBPATH:-/}
       - OPENZAAK_SUPERUSER_USERNAME=admin
       - DJANGO_SUPERUSER_PASSWORD=admin
       - OPENZAAK_SUPERUSER_EMAIL=admin@localhost
-      - CELERY_BROKER_URL=redis://redis:6379/1
-      - CELERY_RESULT_BACKEND=redis://redis:6379/1
+      - CELERY_BROKER_URL=redis://open-zaak-redis:6379/1
+      - CELERY_RESULT_BACKEND=redis://open-zaak-redis:6379/1
       - CELERY_LOGLEVEL=DEBUG
       - CELERY_WORKER_CONCURRENCY=${CELERY_WORKER_CONCURRENCY:-4}
+      - SENDFILE_BACKEND=django_sendfile.backends.simple
+      - NOTIFICATIONS_DISABLED=yes
     ports:
       - 8000:8000
-    volumes: &app-volumes
-      - media:/app/media  # Shared media volume to get access to saved OAS files
+    volumes: &openzaak-volumes
+      - media:/app/media
       - private-media:/app/private-media
     depends_on:
-      - postgis
-      - redis
+      - open-zaak-db
+      - open-zaak-redis
+
+  open-zaak-celery:
+    image: openzaak/open-zaak:latest
+    environment: *openzaak-env
+    command: /celery_worker.sh
+    volumes: *openzaak-volumes
+    depends_on:
+      - open-zaak-db
+      - open-zaak-redis
+
+  open-zaak-celery-flower:
+    image: openzaak/open-zaak:latest
+    environment: *openzaak-env
+    command: /celery_flower.sh
+    ports:
+      - 5555:5555
+    depends_on:
+      - open-zaak-redis
+      - open-zaak-celery
+
+  nginx:
+    image: nginx
+    volumes:
+      - ./docker/nginx/default.conf:/etc/nginx/conf.d/default.conf
+    ports:
+      - "9000:80"
+    depends_on:
+      - open-zaak
 
   zaakbrug:
     build: .
-    image: zaakbrug
+    image: wearefrank/zaakbrug:latest
     container_name: zaakbrug
-    volumes:
-      - ./data:/usr/local/tomcat/data
+    volumes: &zaakbrug-database-data
+      - ../frank-runner/data:/usr/local/tomcat/data
+      # - ./data:/usr/local/tomcat/data
     environment:
-      - zgw.baseurl=http://open-zaak:8000/
+      - zgw.baseurl=http://host.docker.internal:8000/
     ports:
       - 8080:8080
+    depends_on:
+    - open-zaak
 
 volumes:
   database-data:

diff --git a/docker/nginx/default.conf b/docker/nginx/default.conf
@@ -0,0 +1,8 @@
+server {
+    listen       80;
+    server_name  localhost;
+
+    location /openzaak {
+        proxy_pass http://host.docker.internal:8000;
+    }
+}