pass

medicine-stack/docker-compose.medicine-stack.yml

@@ -22,6 +22,8 @@ services:
     restart: "always"
     networks:
       - medicine-network
+    env_file:
+      - ../.env
     environment:
       POSTGRES_USER: "${POSTGRES_USER}"
       POSTGRES_PASSWORD: "${POSTGRES_PASSWORD}"

medicine/docker-compose.override.yml

@@ -0,0 +1,13 @@
+
+version: '3'
+
+services:
+
+  nginx:
+    restart: "no"
+
+  app:
+    restart: "no"
+
+  tasks:
+    restart: "no"

medicine/docker-compose.yml

@@ -7,6 +7,8 @@ services:
     image: docker.med-logic.ru/medicine-nginx:latest
     container_name: medicine-nginx
     restart: "always"
+    env_file:
+      - ../.env
     volumes:
       - medicine-public-data:/app/public:ro
     links:
@@ -28,6 +30,8 @@ services:
     image: docker.med-logic.ru/medicine-app:latest
     container_name: medicine-app
     restart: "always"
+    env_file:
+      - ../.env
     environment:
       UWSGI_PROCESSES: ${UWSGI_PROCESSES}
       UWSGI_THREADS: ${UWSGI_THREADS}
@@ -54,6 +58,8 @@ services:
     container_name: medicine-tasks
     restart: "always"
     command: /usr/bin/supervisord -c /etc/supervisor/conf.d/supervisord-tasks.conf
+    env_file:
+      - ../.env
     volumes:
       - ./.env:/app/.env
       - medicine-public-data:/app/public

run

@@ -17,4 +17,18 @@ update_thirdparty_apps() {
     docker-compose -f docker-compose.thirdparty-apps.yml up -d
 }
 
+update_tfoms_patient() {
+    docker pull docker.med-logic.ru/tfoms-patient:latest
+    docker-compose -f docker-compose.tfoms-patient.yml stop
+    docker-compose -f docker-compose.tfoms-patient.yml up -d
+}
+
+update_medicine() {
+    docker pull docker.med-logic.ru/medicine-app:latest
+    docker pull docker.med-logic.ru/medicine-nginx:latest
+    docker-compose -f docker-compose.medicine.yml stop
+    docker-compose -f docker-compose.medicine.yml up -d
+
+}
+
 ${COMMAND}

tfoms-patient/docker-compose.tfoms-patient.yml

@@ -7,6 +7,8 @@ services:
     container_name: tfoms-patient
     restart: "always"
     image: docker.med-logic.ru/tfoms-patient:latest
+    env_file:
+      - ../.env
     environment:
       - SENTRY_SITE=${SENTRY_SITE}
       - SQLALCHEMY_DATABASE_URI=postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@postgres-host/tfoms_patient

thirdparty-apps/docker-compose.override.yml

@@ -0,0 +1,12 @@
+version: '3'
+
+services:
+
+  pgadmin:
+    restart: "no"
+
+  filebrowser:
+    restart: "no"
+
+  flower:
+    restart: "no"

thirdparty-apps/docker-compose.yml

@@ -53,7 +53,7 @@ services:
       --max_tasks=500
     build:
       context: ./
-      dockerfile: ./Dockerfiles/Dockerfile-flower
+      dockerfile: ./Dockerfile-flower
     external_links:
       - "redis:redis-host"
     networks: