From a5bc4cfc5ee6191a82ec5587adad0f973ad6be16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs?= Date: Thu, 13 Jan 2022 18:32:41 -0500 Subject: [PATCH 1/4] Add volumes to docker-compose --- docker-compose.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docker-compose.yml b/docker-compose.yml index 1766f78..5803100 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -9,6 +9,9 @@ services: - "7012:80" tty: true restart: "always" + volumes: + - personalsite_app:/srv/app/static + - personalsite_app:/srv/app/media networks: teanet: ipv4_address: 172.23.0.5 @@ -31,6 +34,7 @@ services: volumes: personalsite_db: + personalsite_app: networks: teanet: From 4bbebdd5e0d42cd08ac600dfe4583c1882dc8086 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs?= Date: Thu, 13 Jan 2022 18:33:23 -0500 Subject: [PATCH 2/4] update config.env.example --- config.env.example | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.env.example b/config.env.example index bc1ee69..e47d3e7 100644 --- a/config.env.example +++ b/config.env.example @@ -4,7 +4,7 @@ WEB_SITE_URL='http://example.org' APP_DEBUG=True -SECRET_KEY= +SECRET_KEY=2q75bebg(9fn4ldkc7&*155kwp14donetc)p5-vut1hvlh&e%- # # DataBase From a8866d0187defab41ff0b63a7472952d25a82c64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs?= Date: Thu, 13 Jan 2022 18:59:28 -0500 Subject: [PATCH 3/4] Add personalsite-db like depend --- docker-compose.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docker-compose.yml b/docker-compose.yml index 5803100..90b8fbd 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -9,6 +9,8 @@ services: - "7012:80" tty: true restart: "always" + depends_on: + - personalsite-db volumes: - personalsite_app:/srv/app/static - personalsite_app:/srv/app/media From efe272fb159965966344b2e414b6fc3f2a31c3c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs?= Date: Thu, 13 Jan 2022 19:11:07 -0500 Subject: [PATCH 4/4] Reorganice database in docker --- config.env.example | 2 +- docker-compose.yml | 32 ++++++++++++++++---------------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/config.env.example b/config.env.example index e47d3e7..94e3a22 100644 --- a/config.env.example +++ b/config.env.example @@ -13,7 +13,7 @@ SECRET_KEY=2q75bebg(9fn4ldkc7&*155kwp14donetc)p5-vut1hvlh&e%- NAME_DB=personalsite USER_DB=postgres PASS_DB=postgres -HOST_DB=172.23.0.6 +HOST_DB=172.23.0.5 PORT_DB=5432 # diff --git a/docker-compose.yml b/docker-compose.yml index 90b8fbd..9613ba3 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,6 +1,22 @@ version: '3' services: + personalsite-db: + image: postgres:alpine + container_name: personalsite-db + ports: + - 5432:5432 + restart: always + volumes: + - personalsite_db:/var/lib/postgresql/data + environment: + - POSTGRES_USER=postgres + - POSTGRES_PASSWORD=postgres + - POSTGRES_DB=personalsite + networks: + teanet: + ipv4_address: 172.23.0.5 + app: image: rusian/personalsite container_name: personalsite @@ -14,22 +30,6 @@ services: volumes: - personalsite_app:/srv/app/static - personalsite_app:/srv/app/media - networks: - teanet: - ipv4_address: 172.23.0.5 - - personalsite-db: - image: postgres:alpine - container_name: personalsite-db - ports: - - 5432:5432 - restart: always - volumes: - - personalsite_db:/var/lib/postgresql/data - environment: - - POSTGRES_USER=postgres - - POSTGRES_PASSWORD=postgres - - POSTGRES_DB=personalsite networks: teanet: ipv4_address: 172.23.0.6