deploy fixes

[wolnelektury.git] / docker-compose.yml

diff --git a/docker-compose.yml b/docker-compose.yml
index b651509..b01e970 100644 (file)
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -7,22 +7,25 @@ x-app-base: &app-base
       GID: ${GID:-1000}
   env_file:
    - .env
       GID: ${GID:-1000}
   env_file:
    - .env

+  environment:
+    DEBUG: "True"

   volumes:
    - ./src:/app/src
   volumes:
    - ./src:/app/src

+   - ./scripts:/app/scripts

    - ./var/media:/app/var/media
    - ./var/static:/app/var/static
    - ./var/counters/:/app/var/counters
    - ./var/media:/app/var/media
    - ./var/static:/app/var/static
    - ./var/counters/:/app/var/counters

+   - ${LIBRARIAN:-/nonexistent}:/${LIBRARIAN:+edita}ble/librarian

    - ipython:/app/.ipython
   depends_on:
    - db
    - redis
    - memcached
    - ipython:/app/.ipython
   depends_on:
    - db
    - redis
    - memcached

+  entrypoint: /app/scripts/entrypoint.sh

 
 services:
   web:
     <<: *app-base
 
 services:
   web:
     <<: *app-base

-    ports:
-     - "8000:8000"

     command: ./manage.py runserver 0.0.0.0:8000
 
   celery:
     command: ./manage.py runserver 0.0.0.0:8000
 
   celery:


@@ -30,8 +33,9 @@ services:
     command: celery -A wolnelektury worker -l info
 
   db:
     command: celery -A wolnelektury worker -l info
 
   db:

-    image: postgres:18
-    container_name: db
+    build:
+      context: .
+      target: postgres

     env_file:
       - .env
     volumes:
     env_file:
       - .env
     volumes:


@@ -43,6 +47,21 @@ services:
   memcached:
     image: memcached:1.6-alpine
 
   memcached:
     image: memcached:1.6-alpine
 

+  nginx:
+    build:
+      context: .
+      target: nginx
+      args:
+        UID: ${UID:-1000}
+        GID: ${GID:-1000}
+    ports:
+      - "127.0.0.1:8101:80"
+    volumes:
+      - ./var/media:/app/var/media:ro
+      - ./scripts/nginx.conf:/etc/nginx/conf.d/default.conf:ro
+    depends_on:
+      - web
+

 
 volumes:
 
 volumes:

-  ipython:
\ No newline at end of file
+  ipython: