From f79d8de8b78e6a6b769832675e632d6edd73d8d1 Mon Sep 17 00:00:00 2001 From: Patrik Segedy Date: Mon, 19 Aug 2024 16:28:07 +0200 Subject: [PATCH] RHINENG-12045: replace postgresql with same image as used in clowder --- conf/database.env | 7 ++++--- dev/database/Dockerfile | 2 +- docker-compose.prod.yml | 3 +-- docker-compose.test.yml | 1 - docker-compose.yml | 3 +-- 5 files changed, 7 insertions(+), 9 deletions(-) diff --git a/conf/database.env b/conf/database.env index f614ac7d0..6b1f748c7 100644 --- a/conf/database.env +++ b/conf/database.env @@ -1,3 +1,4 @@ -POSTGRES_USER=admin -POSTGRES_PASSWORD=passwd -POSTGRES_DB=patchman +POSTGRESQL_USER=admin +POSTGRESQL_PASSWORD=passwd +POSTGRESQL_DATABASE=patchman +PGDATA=/var/lib/pgsql/data diff --git a/dev/database/Dockerfile b/dev/database/Dockerfile index a883a0e59..f69119bd2 100644 --- a/dev/database/Dockerfile +++ b/dev/database/Dockerfile @@ -1,4 +1,4 @@ -FROM docker.io/library/postgres:16.1 +FROM quay.io/cloudservices/postgresql-rds:16-4649c84 ADD /dev/database/init.sh /docker-entrypoint-initdb.d/ diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml index c267627ec..5d26c8501 100644 --- a/docker-compose.prod.yml +++ b/docker-compose.prod.yml @@ -7,9 +7,8 @@ services: context: . dockerfile: dev/database/Dockerfile image: patchman-engine-db - command: 'postgres -c config_file=/opt/app-root/src/postgresql-cfg/custom.conf' volumes: - - db-data:/var/lib/postgresql/data + - db-data:/var/lib/pgsql/data ports: - 5433:5432 env_file: diff --git a/docker-compose.test.yml b/docker-compose.test.yml index d63764e46..c34efae87 100644 --- a/docker-compose.test.yml +++ b/docker-compose.test.yml @@ -6,7 +6,6 @@ services: context: . dockerfile: dev/database/Dockerfile image: patchman-engine-db - command: 'postgres -c config_file=/opt/app-root/src/postgresql-cfg/custom.conf' ports: - 5433:5432 env_file: diff --git a/docker-compose.yml b/docker-compose.yml index 4d618f445..a9321eb62 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -7,9 +7,8 @@ services: context: . dockerfile: dev/database/Dockerfile image: patchman-engine-db - command: 'postgres -c config_file=/opt/app-root/src/postgresql-cfg/custom.conf' volumes: - - db-data:/var/lib/postgresql/data + - db-data:/var/lib/pgsql/data ports: - 5433:5432 env_file: