Merge pull request #1 from finmars-platform/PLAT-1823-7

Update docker files

Author: paktusov

.env.sample

@@ -32,5 +32,4 @@ AUTHORIZER_URL=
 BACKEND_ROLES=
 CSRF_COOKIE_DOMAIN=
 REDIS_HOST=
-RABBITMQ_HOST=
-LOCAL=1
+RABBITMQ_HOST=

.gitignore

@@ -167,3 +167,5 @@ api_docs
 postgres_data/
 rabbitmq_data/
 redis_data/
+
+*.sql

Dockerfile

@@ -11,6 +11,15 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
 
 WORKDIR /var/app
 
+RUN mkdir -p \
+    /var/app-data/import/configs/ \
+    /var/app-data/import/files/ \
+    /var/app-data/media/ \
+    /var/app/finmars_data \
+    /var/log/celery \
+    /var/log/finmars/backend && \
+    chmod 777 /var/app/finmars_data /var/log/finmars/
+
 COPY requirements.txt .
 RUN pip install --upgrade pip && \
     pip install --no-cache-dir -r requirements.txt
@@ -22,21 +31,9 @@ COPY poms_app ./poms_app
 COPY poms ./poms
 COPY manage.py ./
 
-# Create necessary directories and change permissions
-RUN mkdir -p \
-    /var/app-data/import/configs/ \
-    /var/app-data/import/files/ \
-    /var/app-data/media/ \
-    /var/app/finmars_data \
-    /var/log/celery \
-    /var/log/finmars/backend && \
-    chmod 777 /var/app/finmars_data
-
 ENV LC_ALL=C.UTF-8 \
     LANG=C.UTF-8
 
-# Make port 8080 available outside container
 EXPOSE 8080
 
-# Run the command on container startup
 CMD ["gunicorn", "poms_app.wsgi", "--config", "poms_app/gunicorn.py"]

celery-dev.sh

@@ -1,4 +1,3 @@
-version: '2'
 services:
   db:
     image: postgres:13-alpine
@@ -11,15 +10,22 @@ services:
     tty: true
     ports:
       - "5434:5432"
+    volumes:
+      - ./postgres_data:/var/lib/postgresql/data
+
   rabbitmq:
     image: rabbitmq
     ports:
       - "5672:5672"
     stdin_open: true
     tty: true
+
   redis:
     image: redis
     ports:
       - "6379:6379"
     stdin_open: true
-    tty: true
+    tty: true
+
+volumes:
+  postgres_data:

docker-compose-stage.yml

@@ -1,18 +1,11 @@
 services:
   web:
-    build:
-      context: .
-      dockerfile: Dockerfile
+    build: .
     env_file:
       - .env
     volumes:
       - ./poms:/var/app/poms
     restart: always
-    depends_on:
-      - db
-      - rabbitmq
-      - redis
-      - backend_migration
     ports:
       - "8080:8080"
 
@@ -21,58 +14,23 @@ services:
     env_file:
       - .env
     environment:
+      - DJANGO_SETTINGS_MODULE=poms_app.settings # remove after change manage.py location
       - INSTANCE_TYPE=worker
-    depends_on:
-      - db
-      - rabbitmq
 
   scheduler:
     build: .
     env_file:
       - .env
     environment:
+      - DJANGO_SETTINGS_MODULE=poms_app.settings # remove after change manage.py location
       - INSTANCE_TYPE=beat
-    depends_on:
-      - db
-      - rabbitmq
 
-  backend_migration:
+  migration:
     build: .
     env_file:
       - .env
     environment:
       - INSTANCE_TYPE=job
-    depends_on:
-      - db
-    command: python manage.py migrate_all_schemes
-
-  db:
-    image: postgres:13-alpine
-    environment:
-      POSTGRES_USER: postgres
-      POSTGRES_PASSWORD: postgres
-      POSTGRES_DB: finmars_dev
-      POSTGRESQL_MAX_OPEN_CONNS: 500
-    stdin_open: true
-    tty: true
-    ports:
-      - "5434:5432"
-    volumes:
-      - ./postgres_data:/var/lib/postgresql/data
-
-  rabbitmq:
-    image: rabbitmq
-    ports:
-      - "5672:5672"
-    stdin_open: true
-    tty: true
-
-  redis:
-    image: redis
-    ports:
-      - "6379:6379"
-    stdin_open: true
-    tty: true
 
 volumes:
   postgres_data: