From e92bd1df3d725094c9afc3b597e71b7d4a8152dc Mon Sep 17 00:00:00 2001 From: Dhruv Baliyan Date: Thu, 5 Dec 2024 12:32:48 +0530 Subject: [PATCH 1/5] feat: add postgis --- common/postgis/docker-compose.yaml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 common/postgis/docker-compose.yaml diff --git a/common/postgis/docker-compose.yaml b/common/postgis/docker-compose.yaml new file mode 100644 index 0000000..e2fe4d5 --- /dev/null +++ b/common/postgis/docker-compose.yaml @@ -0,0 +1,17 @@ +services: + postgis: + image: postgis/postgis:16-3.4-alpine + restart: always + volumes: + - postgis:/var/postgresql/data + healthcheck: + test: ["CMD-SHELL", "pg_isready -U postgres"] + interval: 5s + timeout: 5s + retries: 5 + environment: + POSTGRES_USER: ${POSTGIS_USER:?POSTGIS_USER is not set} + POSTGRES_PASSWORD: ${POSTGIS_USER:?POSTGIS_PASSWORD is not set} + +volumes: + postgis: \ No newline at end of file From 1ac84f7db6cc5e46689fba10ce0aa9399920d49a Mon Sep 17 00:00:00 2001 From: Karun Agarwal <113603846+singhalkarun@users.noreply.github.com> Date: Thu, 5 Dec 2024 15:22:04 +0530 Subject: [PATCH 2/5] fix typo in docker-compose.yaml, import in example files --- common/postgis/docker-compose.yaml | 2 +- docker-compose.SDC.yaml.example | 1 + docker-compose.yaml.example | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/common/postgis/docker-compose.yaml b/common/postgis/docker-compose.yaml index e2fe4d5..6b3659b 100644 --- a/common/postgis/docker-compose.yaml +++ b/common/postgis/docker-compose.yaml @@ -11,7 +11,7 @@ services: retries: 5 environment: POSTGRES_USER: ${POSTGIS_USER:?POSTGIS_USER is not set} - POSTGRES_PASSWORD: ${POSTGIS_USER:?POSTGIS_PASSWORD is not set} + POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:?POSTGIS_PASSWORD is not set} volumes: postgis: \ No newline at end of file diff --git a/docker-compose.SDC.yaml.example b/docker-compose.SDC.yaml.example index afdb415..32ce32d 100644 --- a/docker-compose.SDC.yaml.example +++ b/docker-compose.SDC.yaml.example @@ -11,6 +11,7 @@ # - ./common/typesense/docker-compose.yaml # - ./common/kong/docker-compose.yaml # - ./common/dragonfly/docker-compose.yaml +# - ./common/postgis/docker-compose.yaml services: caddy: diff --git a/docker-compose.yaml.example b/docker-compose.yaml.example index 12b18b1..84fdbfe 100644 --- a/docker-compose.yaml.example +++ b/docker-compose.yaml.example @@ -14,6 +14,7 @@ # - ./common/kong/docker-compose.yaml # - ./common/pgweb/docker-compose.yaml # - ./common/dragonfly/docker-compose.yaml +# - ./common/postgis/docker-compose.yaml services: caddy: From 538f9eb66a731e83e0dc2784460c634654f2e28f Mon Sep 17 00:00:00 2001 From: Karun Agarwal <113603846+singhalkarun@users.noreply.github.com> Date: Thu, 5 Dec 2024 15:22:47 +0530 Subject: [PATCH 3/5] add postgis variables in sample.env --- common/sample.env | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/common/sample.env b/common/sample.env index 2bcd00f..372602a 100644 --- a/common/sample.env +++ b/common/sample.env @@ -50,4 +50,8 @@ RABBITMQ_DEFAULT_USER= RABBITMQ_DEFAULT_PASSWORD= #pgweb -PGWEB_DATABASE_URL= \ No newline at end of file +PGWEB_DATABASE_URL= + +#postgis +POSTGRES_USER= +POSTGRES_PASSWORD= \ No newline at end of file From fc18c6dde4bb4c2d6b3556b1eaefabb08a381ee1 Mon Sep 17 00:00:00 2001 From: Karun Agarwal <113603846+singhalkarun@users.noreply.github.com> Date: Thu, 5 Dec 2024 16:05:34 +0530 Subject: [PATCH 4/5] Update sample.env --- common/sample.env | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common/sample.env b/common/sample.env index 372602a..6453f4c 100644 --- a/common/sample.env +++ b/common/sample.env @@ -53,5 +53,5 @@ RABBITMQ_DEFAULT_PASSWORD= PGWEB_DATABASE_URL= #postgis -POSTGRES_USER= -POSTGRES_PASSWORD= \ No newline at end of file +POSTGIS_USER= +POSTGIS_PASSWORD= From 5630a3397a52534b606117ba3d17724fa513e11c Mon Sep 17 00:00:00 2001 From: Karun Agarwal <113603846+singhalkarun@users.noreply.github.com> Date: Thu, 5 Dec 2024 16:06:49 +0530 Subject: [PATCH 5/5] Update docker-compose.yaml --- common/postgis/docker-compose.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/common/postgis/docker-compose.yaml b/common/postgis/docker-compose.yaml index 6b3659b..a455525 100644 --- a/common/postgis/docker-compose.yaml +++ b/common/postgis/docker-compose.yaml @@ -10,8 +10,8 @@ services: timeout: 5s retries: 5 environment: - POSTGRES_USER: ${POSTGIS_USER:?POSTGIS_USER is not set} - POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:?POSTGIS_PASSWORD is not set} + POSTGIS_USER: ${POSTGIS_USER:?POSTGIS_USER is not set} + POSTGIS_PASSWORD: ${POSTGIS_PASSWORD:?POSTGIS_PASSWORD is not set} volumes: - postgis: \ No newline at end of file + postgis: