From e5581166a7735c8c891e08bec38f2979ceada5ab Mon Sep 17 00:00:00 2001 From: Sam Oehlert Date: Wed, 16 Oct 2024 15:20:31 -0500 Subject: [PATCH 1/2] style(whitespace): remove extraneous whitespace --- compose.override.production.yml | 2 ++ compose.yml | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/compose.override.production.yml b/compose.override.production.yml index 112473c8..be9b3057 100644 --- a/compose.override.production.yml +++ b/compose.override.production.yml @@ -27,6 +27,8 @@ services: - production_postgres_data_backups:/backups:z env_file: - ./.envs/.production/.postgres + deploy: + replicas: 0 nginx: image: nginx:1.19 diff --git a/compose.yml b/compose.yml index 30a6c624..357cfddd 100644 --- a/compose.yml +++ b/compose.yml @@ -32,6 +32,8 @@ services: - net.ipv6.conf.all.disable_ipv6=0 healthcheck: test: ["CMD-SHELL", "pg_isready -U postgres"] + deploy: + replicas: ${POSTGRES_ENABLED:-0} redis: image: redis:5.0 @@ -64,4 +66,3 @@ services: default: {} sysctls: - net.ipv6.conf.all.disable_ipv6=0 - From 7cdf074958e58346cd9a9a52993545d866bdbb3a Mon Sep 17 00:00:00 2001 From: Sam Oehlert Date: Thu, 17 Oct 2024 10:28:35 -0500 Subject: [PATCH 2/2] ci(postgres): enable the containerized postgres container in CI --- .gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ef651524..f52a7080 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -28,6 +28,8 @@ pytest: image: docker:24.0.6-dind services: - docker:dind + variables: + POSTGRES_ENABLED: 1 before_script: - apk add make - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY