From 30c12fd7261b7aab69bc96c494217fed20ed388f Mon Sep 17 00:00:00 2001
From: Pavel Kirilin <win10@list.ru>
Date: Sun, 19 Jan 2020 14:18:45 +0400
Subject: [PATCH] Fixed deploy configuration.
Signed-off-by: Pavel Kirilin <win10@list.ru>
---
Makefile | 8 ++++----
docker-compose.prod.yml | 2 ++
docker-compose.yml | 2 ++
systemd/bot_sys_admin.service | 2 +-
4 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/Makefile b/Makefile
index 749e4c7..49e49d2 100644
--- a/Makefile
+++ b/Makefile
@@ -17,7 +17,7 @@ service: build_service
## Wait until postgres is up
service_wait:
- @docker exec -it telegram_system_bot make wait_resources
+ @docker exec -i telegram_system_bot make wait_resources
_run_local:
@docker-compose up -d
@@ -39,11 +39,11 @@ rm:
@docker-compose down -v
## Clean all containers
-clean_service:
+clean_prod:
@docker-compose -f docker-compose.prod.yml down
## Remove containers and volumes
-rm_service:
+rm_prod:
@docker-compose -f docker-compose.prod.yml down -v
## Runs PostgreSQL UI. | Database
@@ -61,7 +61,7 @@ migrations:
## Upgrades database.
migrate:
- @docker exec -it telegram_system_bot alembic upgrade head;
+ @docker exec -i telegram_system_bot alembic upgrade head;
## Waits postgresql to be online
wait_resources:
diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml
index 6c67577..71aa015 100644
--- a/docker-compose.prod.yml
+++ b/docker-compose.prod.yml
@@ -24,6 +24,8 @@ services:
networks:
- system_bot_network
command: make _run_bot
+ depends_on:
+ - system_bot_postgres
system_bot_postgres:
container_name: 'system_bot_postgres'
diff --git a/docker-compose.yml b/docker-compose.yml
index 94c1684..2b3e15c 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -25,6 +25,8 @@ services:
networks:
- dev_system_bot_network
command: make _dev_run_bot
+ depends_on:
+ - system_bot_postgres
system_bot_postgres:
container_name: 'system_bot_postgres'
diff --git a/systemd/bot_sys_admin.service b/systemd/bot_sys_admin.service
index 67fea8f..6643e3d 100644
--- a/systemd/bot_sys_admin.service
+++ b/systemd/bot_sys_admin.service
@@ -7,7 +7,7 @@ Type=simple
User=bots
WorkingDirectory=/home/bots/repos/system_admin
ExecStart=/bin/bash -c 'make prod'
-ExecStop=/bin/bash -c 'make clean'
+ExecStop=/bin/bash -c 'make clean_prod'
Restart=on-abort
[Install]
--
GitLab