From aceb37354f8e0b5ec78e2f87b6d6c38c8f4dfe42 Mon Sep 17 00:00:00 2001 From: Denis Rouzaud Date: Thu, 1 Feb 2024 15:00:53 +0100 Subject: [PATCH 1/4] fix pg_service.conf location --- datamodel/.docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/datamodel/.docker/Dockerfile b/datamodel/.docker/Dockerfile index e7b35c0cc..0e894654e 100644 --- a/datamodel/.docker/Dockerfile +++ b/datamodel/.docker/Dockerfile @@ -40,7 +40,7 @@ RUN if [ "${AUTO_INIT}" = "True" ]; then ln -s /src/datamodel/.docker/init_db.sh # Some defaults ENV POSTGRES_PASSWORD=postgres # otherwise psycopg2 cannot connect -ENV PGSERVICEFILE=/etc/postgresql-common/pg_service.conf +ENV PGSERVICEFILE=$(pg_config --sysconfdir)/pg_service.conf ENV PGSERVICE=pg_tww From 860fff3802548eb3208a76da547bc3f124a9f20b Mon Sep 17 00:00:00 2001 From: Denis Rouzaud Date: Thu, 1 Feb 2024 15:03:42 +0100 Subject: [PATCH 2/4] Update Dockerfile --- datamodel/.docker/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/datamodel/.docker/Dockerfile b/datamodel/.docker/Dockerfile index 0e894654e..e7b35c0cc 100644 --- a/datamodel/.docker/Dockerfile +++ b/datamodel/.docker/Dockerfile @@ -40,7 +40,7 @@ RUN if [ "${AUTO_INIT}" = "True" ]; then ln -s /src/datamodel/.docker/init_db.sh # Some defaults ENV POSTGRES_PASSWORD=postgres # otherwise psycopg2 cannot connect -ENV PGSERVICEFILE=$(pg_config --sysconfdir)/pg_service.conf +ENV PGSERVICEFILE=/etc/postgresql-common/pg_service.conf ENV PGSERVICE=pg_tww From d5cf1e7f07150cbdb8410e895e12d0cc6bd9157c Mon Sep 17 00:00:00 2001 From: Denis Rouzaud Date: Thu, 1 Feb 2024 15:04:50 +0100 Subject: [PATCH 3/4] Update Dockerfile --- datamodel/.docker/Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/datamodel/.docker/Dockerfile b/datamodel/.docker/Dockerfile index e7b35c0cc..fa87867ca 100644 --- a/datamodel/.docker/Dockerfile +++ b/datamodel/.docker/Dockerfile @@ -27,9 +27,9 @@ RUN if [ "${RUN_TEST}" = "True" ]; then pip install -r datamodel/requirements-te # Configure the postgres connections -RUN printf '[postgres]\ndbname=postgres\nuser=postgres\n' >> $(pg_config --sysconfdir)/pg_service.conf -RUN printf '[pg_tww]\ndbname=tww\nuser=postgres\n' >> $(pg_config --sysconfdir)/pg_service.conf -RUN printf '[pg_tww_demo]\ndbname=tww_demo\nuser=postgres\n' >> $(pg_config --sysconfdir)/pg_service.conf +RUN printf '[postgres]\ndbname=postgres\nuser=postgres\n' >> /etc/postgresql-common/pg_service.conf +RUN printf '[pg_tww]\ndbname=tww\nuser=postgres\n' >> /etc/postgresql-common/pg_service.conf +RUN printf '[pg_tww_demo]\ndbname=tww_demo\nuser=postgres\n' >> /etc/postgresql-common/pg_service.conf RUN chmod +x /src/datamodel/.docker/init_db.sh ENV PATH="/src/datamodel/.docker:${PATH}" From 6bef7782570178dc512dbbc89401ba4d194114aa Mon Sep 17 00:00:00 2001 From: Denis Rouzaud Date: Thu, 1 Feb 2024 15:12:19 +0100 Subject: [PATCH 4/4] Update Dockerfile --- plugin/.docker/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugin/.docker/Dockerfile b/plugin/.docker/Dockerfile index 477440a53..8a01be78e 100644 --- a/plugin/.docker/Dockerfile +++ b/plugin/.docker/Dockerfile @@ -9,8 +9,8 @@ RUN apt-get update && \ apt-get -y install openjdk-8-jre curl locales postgresql-client python3-geoalchemy2 \ && rm -rf /var/lib/apt/lists/* -RUN printf '[postgres]\ndbname=postgres\nuser=postgres\n' >> $(pg_config --sysconfdir)/pg_service.conf -RUN printf '[pg_tww]\ndbname=tww\nuser=postgres\n' >> $(pg_config --sysconfdir)/pg_service.conf +RUN printf '[postgres]\ndbname=postgres\nuser=postgres\n' >> /etc/postgresql-common/pg_service.conf +RUN printf '[pg_tww]\ndbname=tww\nuser=postgres\n' >> /etc/postgresql-common/pg_service.conf # Some defaults ENV POSTGRES_PASSWORD=postgres