From b1b470cbeccbe6493660c27088f1e0a2f41b1fdc Mon Sep 17 00:00:00 2001 From: Ilya Mukhortov <> Date: Wed, 8 Jul 2020 20:17:12 +1000 Subject: [PATCH] pass --- .gitignore | 4 +++- medicine-timetable/docker-compose.yml | 20 ++++++++++++++++++++ medicine/docker-compose.yml | 2 -- thirdparty-apps/update.sh | 8 ++++++++ 4 files changed, 31 insertions(+), 3 deletions(-) create mode 100644 medicine-timetable/docker-compose.yml create mode 100644 thirdparty-apps/update.sh diff --git a/.gitignore b/.gitignore index cc499fb..08aff29 100644 --- a/.gitignore +++ b/.gitignore @@ -12,4 +12,6 @@ docker-compose.override.yml .idea/* .vs/* -volumes/* +medicine/volumes/* +medicine-stack/volumes/* +thirdparty-apps/volumes/* diff --git a/medicine-timetable/docker-compose.yml b/medicine-timetable/docker-compose.yml new file mode 100644 index 0000000..8dbfbdb --- /dev/null +++ b/medicine-timetable/docker-compose.yml @@ -0,0 +1,20 @@ + +version: '3' + +services: + + medicine-timetable: + image: docker.med-logic.ru/medicine-timetable + container_name: "medicine-timetable" + restart: "always" + ports: + - "882:80" + networks: + - medicine-network + external_links: + - "medicine-nginx:medicine-host" + +networks: + medicine-network: + external: + name: "medicine-network" diff --git a/medicine/docker-compose.yml b/medicine/docker-compose.yml index d51e98b..2db9660 100644 --- a/medicine/docker-compose.yml +++ b/medicine/docker-compose.yml @@ -16,8 +16,6 @@ services: networks: - default - medicine-network - extra_hosts: - - "host.docker:${HOST_DOCKER}" logging: driver: "json-file" options: diff --git a/thirdparty-apps/update.sh b/thirdparty-apps/update.sh new file mode 100644 index 0000000..092ae3c --- /dev/null +++ b/thirdparty-apps/update.sh @@ -0,0 +1,8 @@ +#!/bin/sh + +docker-compose stop +docker-compose pull +docker-compose build +docker-compose up -d + +chmod +x update.sh