broke

docker-compose.yml

@@ -10,9 +10,6 @@ services:
     build: .
     ports:
       - "5000:5000"
-    volumes:
-      - .:/app
-      - ./static/uploads:/app/static/uploads
     env_file:
       - .env
     environment:
@@ -37,6 +34,9 @@ services:
       timeout: 3s
       retries: 3
       start_period: 30s
+    volumes:
+      - .:/app:delegated
+      - ./${UPLOAD_FOLDER}:/app/${UPLOAD_FOLDER}
     networks:
       - appnet
 
@@ -53,7 +53,7 @@ services:
     ports:
       - "42000:3306"
     volumes:
-      - ./mysql_data:/var/lib/mysql
+      - ./${MYSQL_DATA_FOLDER}:/var/lib/mysql
     entrypoint: >
       sh -c "mkdir -p /var/lib/mysql &&
              chown -R 1000:998 /var/lib/mysql &&
@@ -72,6 +72,8 @@ services:
     restart: always
     ports:
       - "8080:8080"
+    env_file:
+      - .env
     environment:
       - ADMINER_DEFAULT_SERVER=db
     depends_on:
@@ -86,7 +88,6 @@ services:
       - "7474:7474"
       - "7687:7687"
     environment:
-      # only the one var Neo4j actually needs
       - NEO4J_AUTH=neo4j/${NEO4J_PASSWORD}
     volumes:
       - neo4j_data:/data
@@ -104,13 +105,35 @@ services:
       - CELERY_BROKER_URL=redis://redis:6379/0
       - CELERY_RESULT_BACKEND=redis://redis:6379/0
     user: "appuser"
-    command: celery -A plugins.utility.celery:celery_app worker --loglevel=info
+    command: celery -A app.celery_app:celery worker --beat --loglevel=info
     depends_on:
       - redis
       - db
     networks:
       - appnet
 
+  flower:
+    build: .
+    env_file:
+      - .env
+    environment:
+      - FLASK_ENV=production
+      - CELERY_BROKER_URL=redis://redis:6379/0
+      - CELERY_RESULT_BACKEND=redis://redis:6379/0
+    command: >
+      celery
+      --app app.celery_app.celery
+      --broker redis://redis:6379/0
+      flower
+      --port=5555
+    depends_on:
+      - redis
+      - db
+    ports:
+      - "5555:5555"
+    networks:
+      - appnet
+
 volumes:
   neo4j_data: