From 1ce423b76255a67b339d6d7a409654cdcee5093e Mon Sep 17 00:00:00 2001
From: Ilya Mukhortov <ilya.muhortov@gmail.com>
Date: Mon, 3 Jul 2023 20:50:48 +1000
Subject: [PATCH] pass

---
 Readme.md                                |  3 ---
 bash_scripts/docker-install.sh           |  4 +++-
 medicine-lis-receiver/docker-compose.yml | 25 ++++++++++++++++++++++++
 medicine/run.sh                          |  1 -
 4 files changed, 28 insertions(+), 5 deletions(-)
 create mode 100644 medicine-lis-receiver/docker-compose.yml

diff --git a/Readme.md b/Readme.md
index e5a31ac..f7b70db 100644
--- a/Readme.md
+++ b/Readme.md
@@ -45,6 +45,3 @@
 на доступном сервере
 
     ssh localhost -p 40022
-
-
-Aa$#123490
\ No newline at end of file
diff --git a/bash_scripts/docker-install.sh b/bash_scripts/docker-install.sh
index 925dd12..1bc1286 100644
--- a/bash_scripts/docker-install.sh
+++ b/bash_scripts/docker-install.sh
@@ -5,6 +5,8 @@ sudo apt-get install --assume-yes \
     ca-certificates \
     curl \
     gnupg-agent \
+    gnupg \
+    lsb-release \
     software-properties-common \
     vim
 
@@ -14,6 +16,6 @@ sudo apt-key fingerprint 0EBFCD88
 sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable"
 
 sudo apt-get update
-sudo apt-get install --assume-yes docker-ce docker-ce-cli containerd.io
+sudo apt-get install --assume-yes docker-ce docker-ce-cli containerd.io docker-compose-plugin
 
 apt-get install --assume-yes python3-pip docker-compose
diff --git a/medicine-lis-receiver/docker-compose.yml b/medicine-lis-receiver/docker-compose.yml
new file mode 100644
index 0000000..68680ed
--- /dev/null
+++ b/medicine-lis-receiver/docker-compose.yml
@@ -0,0 +1,25 @@
+version: '3'
+
+services:
+  medicine-remd:
+    restart: "always"
+    image: docker.med-logic.ru/medicine-lis-receiver:latest
+    container_name: medicine-lis-receiver
+    environment:
+      DATABASE_URL: user:password@postgres-host/medicine
+    ports:
+      - "890:9500"
+    networks:
+      - medicine-network
+    external_links:
+      - "postgres:postgres-host"
+    logging:
+      driver: "json-file"
+      options:
+        max-size: "200k"
+        max-file: "10"
+
+networks:
+  medicine-network:
+    external:
+      name: "medicine-network"
diff --git a/medicine/run.sh b/medicine/run.sh
index 974f636..e03ed77 100644
--- a/medicine/run.sh
+++ b/medicine/run.sh
@@ -23,7 +23,6 @@ backup_database() {
 
 post_update() {
   docker-compose run --rm app python manage.py migrate --noinput
-  docker-compose run --rm app python manage.py directory_importdata all
   docker-compose run --rm app python manage.py collectstatic --noinput
   docker-compose run --rm app python manage.py post_update
   docker-compose run --rm app python manage.py catalog2_importdata