From ecc865c47fa7cec41008a4dc2a851a2fc2803816 Mon Sep 17 00:00:00 2001
From: Ilya Mukhortov <ilya.muhortov@gmail.com>
Date: Wed, 13 Mar 2024 16:39:31 +1000
Subject: [PATCH] new image

---
 medicine/default.docker-compose.override.yml |  4 ---
 medicine/docker-compose.yml                  | 31 ++++----------------
 medicine/restart.sh                          |  4 +++
 medicine/update.sh                           | 13 ++++++++
 4 files changed, 22 insertions(+), 30 deletions(-)
 create mode 100755 medicine/restart.sh
 create mode 100755 medicine/update.sh

diff --git a/medicine/default.docker-compose.override.yml b/medicine/default.docker-compose.override.yml
index c4031a9..2a3f004 100644
--- a/medicine/default.docker-compose.override.yml
+++ b/medicine/default.docker-compose.override.yml
@@ -3,10 +3,6 @@ version: '3'
 
 services:
 
-  nginx:
-    external_links:
-      - "tfoms-patient:patient-search-host"
-
   app:
     external_links:
       - "tfoms-patient:patient-search-host"
diff --git a/medicine/docker-compose.yml b/medicine/docker-compose.yml
index 4a45a62..a3be4a2 100644
--- a/medicine/docker-compose.yml
+++ b/medicine/docker-compose.yml
@@ -3,40 +3,19 @@ version: '3'
 
 services:
 
-  nginx:
-    image: docker.med-logic.ru/medicine-nginx:latest
-    container_name: medicine-nginx
-    restart: "always"
-    volumes:
-      - medicine-public-data:/app/public:ro
-    links:
-      - "app:app-host"
-    ports:
-      - "${NGINX_PORT}:80"
-      - "${NGINX_HTTPS_PORT}:443"
-    networks:
-      - default
-      - medicine-network
-    logging:
-      driver: "json-file"
-      options:
-        max-size: "200k"
-        max-file: "10"
-
   app:
-    image: docker.med-logic.ru/medicine-app:latest
+    image: docker.med-logic.ru/medicine:latest
     container_name: medicine-app
     restart: "always"
     environment:
       UWSGI_PROCESSES: ${UWSGI_PROCESSES}
       UWSGI_THREADS: ${UWSGI_THREADS}
-    expose:
-      - "840"
-    command: /usr/bin/supervisord -c /etc/supervisor/conf.d/supervisord.conf
+    ports:
+      - "${NGINX_PORT}:80"
+      - "${NGINX_HTTPS_PORT}:443"
     volumes:
       - medicine-public-data:/app/public
       - ./.env:/app/.env
-      - ../volumes/files:/volumes
     networks:
       - default
       - medicine-network
@@ -50,7 +29,7 @@ services:
         max-file: "10"
 
   tasks:
-    image: docker.med-logic.ru/medicine-app:latest
+    image: docker.med-logic.ru/medicine:latest
     container_name: medicine-tasks
     restart: "always"
     command: /usr/bin/supervisord -c /etc/supervisor/conf.d/supervisord-tasks.conf
diff --git a/medicine/restart.sh b/medicine/restart.sh
new file mode 100755
index 0000000..2a1aeb3
--- /dev/null
+++ b/medicine/restart.sh
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+docker-compose stop
+docker-compose up -d
diff --git a/medicine/update.sh b/medicine/update.sh
new file mode 100755
index 0000000..e6c4d32
--- /dev/null
+++ b/medicine/update.sh
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+set -e
+
+echo "readonly" | docker login docker.med-logic.ru --username readonly --password-stdin
+docker pull docker.med-logic.ru/medicine:latest
+
+(cd /root/medicine-config/medicine &&
+  docker-compose stop &&
+  docker-compose up -d
+)
+
+docker rmi $(docker images -f "dangling=true" -q)