docker-compose update (support nginx ;))

dsever · Oct 5, 2018 · df48007 · df48007
1 parent 9813855
commit df48007
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 26 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,16 +1,15 @@
-version: '3.6'
+version: '3.7'
 services:
 
   rabbitmq:
     image: rabbitmq:latest
     container_name: patrowl_rabbitmq
     environment:
-      - RABBITMQ_SERVER_ADDITIONAL_ERL_ARGS="-rabbit log_levels [{connection,error}]"
+      - RABBITMQ_SERVER_ADDITIONAL_ERL_ARGS=-rabbit log_levels [{connection,error}]
     ports:
       - '5672:5672'
 
   db:
-    # image: postgres:latest
     image: postgres:10.1-alpine
     container_name: patrowl_postgres
     environment:
@@ -23,18 +22,6 @@ services:
       - ./var/db/init_db.sql:/docker-entrypoint-initdb.d/init_db.sql
     # volumes:
     #   - postgres_data:/var/lib/postgresql/data/
-  #
-  # nginx:
-  #   image: nginx:latest
-  #   restart: always
-  #   container_name: patrowl_nginx
-  #   ports:
-  #     - "18000:18000"
-  #   links:
-  #     - web:web
-  #   volumes:
-  #     - ./:/opt/patrowl-manager/
-  #     - ./nginx_docker.conf:/etc/nginx/conf.d/default.conf
 
   web:
     container_name: patrowl_django
@@ -46,17 +33,19 @@ services:
     depends_on:
       - db
       - rabbitmq
-    # volumes:
-    #   - ./:/opt/patrowl-manager/
     ports:
       - "0.0.0.0:8001:8001"
     links:
       - db
       - rabbitmq
 
-  # start_dependencies:
-  #   image: dadarek/wait-for-dependencies
-  #   depends_on:
-  #     - db
-  #     - rabbitmq
-  #   command: db:5432 rabbitmq:5672
+  nginx:
+    image: nginx:latest
+    container_name: patrowl_nginx
+    ports:
+      - "8080:8080"
+    volumes:
+      - ./:/opt/patrowl-manager/
+      - ./nginx_docker.conf:/etc/nginx/conf.d/default.conf
+    depends_on:
+      - web
diff --git a/nginx_docker.conf b/nginx_docker.conf
@@ -1,5 +1,5 @@
 server {
-    listen 80;
+    listen 8080;
     autoindex on;
     server_name localhost;
 
@@ -9,7 +9,8 @@ server {
     error_log /opt/patrowl-manager/var/log/nginx.patrowlmanager-error.log;
 
     location / {
-        proxy_pass http://127.0.0.1:8000;
+        #proxy_pass http://127.0.0.1:8001;
+        proxy_pass http://web:8001;
     }
 
     location /static {

diff --git a/start-server.sh b/start-server.sh
@@ -15,5 +15,6 @@ else
   echo -e "supervisord stopped. Starting supervisord."
   supervisord -c var/etc/supervisord.conf
 fi
-python manage.py makemigrations && python manage.py migrate && python manage.py runserver_plus 0.0.0.0:8000
+#python manage.py makemigrations && python manage.py migrate && python manage.py runserver_plus 0.0.0.0:8000
+gunicorn app.wsgi:application -b :8000
 deactivate