From f0ec5745ebf54b959725678c00ac2fa25b3872e2 Mon Sep 17 00:00:00 2001
From: knoflook <knoflook@disroot.org>
Date: Tue, 27 Sep 2022 17:08:15 +0200
Subject: [PATCH] add sql extensions

---
 compose.yml       | 13 ++++++-------
 pg_entrypoint.sh  | 16 ----------------
 pg_extensions.sql |  2 ++
 3 files changed, 8 insertions(+), 23 deletions(-)
 delete mode 100644 pg_entrypoint.sh
 create mode 100644 pg_extensions.sql

diff --git a/compose.yml b/compose.yml
index 3663979..c114fd5 100644
--- a/compose.yml
+++ b/compose.yml
@@ -50,7 +50,7 @@ services:
       - LISTEN_HOST=0.0.0.0
       - LISTEN_SERVER=uvicorn
       - SECRET_KEY=foobar
-      - DATABASE_HOST=postgres
+      - DATABASE_HOST=db
       - DATABASE_PORT=5432
       - DATABASE_NAME=karrot
       - DATABASE_USER=karrot
@@ -124,10 +124,9 @@ services:
       timeout: 3s
       retries: 30
     configs:
-      - source: postgres_entrypoint
-        target: /coopcloud-entrypoint.sh
+      - source: postgres_extensions
+        target: /docker-entrypoint-initdb.d/extensions.sql
         mode: 0555
-    entrypoint: /coopcloud-entrypoint.sh
     volumes:
       - "postgres_data:/var/lib/postgresql/data"
     networks:
@@ -148,9 +147,9 @@ configs:
     name: ${STACK_NAME}_nginx_config_${NGINX_CONFIG_VERSION}
     file: nginx.conf.tmpl
     template_driver: golang
-  postgres_entrypoint:
-    name: ${STACK_NAME}_postgres_entrypoint_${POSTGRES_ENTRYPOINT_VERSION}
-    file: pg_entrypoint.sh
+  postgres_extensions:
+    name: ${STACK_NAME}_postgres_extensions_${POSTGRES_ENTRYPOINT_VERSION}
+    file: pg_extensions.sql
 
 volumes:
   shiv_data:
diff --git a/pg_entrypoint.sh b/pg_entrypoint.sh
deleted file mode 100644
index 1c36312..0000000
--- a/pg_entrypoint.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-# This is based on https://github.com/postgis/docker-postgis/blob/4eb614133d6aa87bfc5c952d24b7eb1f499e5c7c/12-3.0/initdb-postgis.sh
-set -e
-
-# Perform all actions as $POSTGRES_USER
-export PGUSER="$POSTGRES_USER"
-
-for DB in template1 "$POSTGRES_DB"; do
-      echo "Loading extensions into $DB"
-      "${psql[@]}" --dbname="$DB" <<-'EOSQL'
-      CREATE EXTENSION IF NOT EXISTS citext;
-      CREATE EXTENSION IF NOT EXISTS btree_gist;
-      EOSQL
-done
-
-/docker-entrypoint.sh "$@"
diff --git a/pg_extensions.sql b/pg_extensions.sql
new file mode 100644
index 0000000..c2f3ea4
--- /dev/null
+++ b/pg_extensions.sql
@@ -0,0 +1,2 @@
+CREATE EXTENSION IF NOT EXISTS citext;
+CREATE EXTENSION IF NOT EXISTS btree_gist;