From 9929ee928afe1402a6ec93fa1883958cc85e4199 Mon Sep 17 00:00:00 2001
From: Orion Kindel <cakekindel@gmail.com>
Date: Wed, 19 Jul 2023 18:46:33 -0500
Subject: [PATCH] fix: gen-migrations workflow

---
 .gitea/workflows/gen-migrations.yml | 7 +++++--
 docker-compose.yml                  | 6 ++++--
 scripts/build.sh                    | 5 +++--
 scripts/diff.sh                     | 8 +++++---
 4 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/.gitea/workflows/gen-migrations.yml b/.gitea/workflows/gen-migrations.yml
index da7e36a..c4418ce 100644
--- a/.gitea/workflows/gen-migrations.yml
+++ b/.gitea/workflows/gen-migrations.yml
@@ -7,7 +7,9 @@ jobs:
           !startsWith(gitea.event.head_commit.message, 'chore')
     container:
       image: 'git.orionkindel.com/dnim/db-ci-runner:disheveled-iceberg-launched-loosely'
-      volumes: ['/run/user/1001/docker.sock:/run/user/1001/docker.sock']
+      volumes:
+        - '/run/user/1001/docker.sock:/run/user/1001/docker.sock'
+        - '/var/run/postgresql:/var/run/postgresql'
     steps:
       - uses: 'actions/checkout@v3'
         with: { fetch-depth: 0, ref: 'main', submodules: 'recursive' }
@@ -39,5 +41,6 @@ jobs:
                 git push
               fi
         env:
-          DOCKER_NETWORK_HOST: 'host.docker.internal'
+          PG_HOST_BASE: '/var/run/postgresql/.s.PGSQL.5432'
+          PG_HOST_HEAD: '/var/run/postgresql/.s.PGSQL.5433'
           DOCKER_HOST: 'unix:///run/user/1001/docker.sock' # HACK: rootless docker on gitea action runner
diff --git a/docker-compose.yml b/docker-compose.yml
index a0bb5b9..25cbe2a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -6,11 +6,13 @@ services:
     network_mode: 'host'
     image: 'postgres:15.3-bullseye'
     env_file: ['./.env.schema']
-    command: '-p 5432'
+    volumes: ['/var/run/postgresql:/var/run/postgresql']
+    command: '-h localhost -p 5432'
   head:
     container_name: 'head'
     network_mode: 'host'
     image: 'postgres:15.3-bullseye'
     restart: 'always'
     env_file: ['./.env.schema']
-    command: '-p 5433'
+    volumes: ['/var/run/postgresql:/var/run/postgresql']
+    command: '-h localhost -p 5433'
diff --git a/scripts/build.sh b/scripts/build.sh
index 01b5447..cdd0d4d 100755
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -10,15 +10,16 @@ rev="$2"
 
 if [[ "$base_or_head" = "head" ]]; then
   port=5433
+  pg_host=${PG_HOST_HEAD:-localhost:$port}
 else
   port=5432
+  pg_host=${PG_HOST_BASE:-localhost:$port}
 fi
 
 docker compose stop "$base_or_head" 1>/dev/null
 docker compose rm -f "$base_or_head" 1>/dev/null
 
-localhost=${DOCKER_NETWORK_HOST:-localhost}
-url="postgresql://$POSTGRES_USER:$POSTGRES_PASSWORD@$localhost:$port"
+url="postgresql://$POSTGRES_USER:$POSTGRES_PASSWORD@$pg_host"
 
 isready() {
   local waited=0
diff --git a/scripts/diff.sh b/scripts/diff.sh
index 8acff0b..53a0a2a 100755
--- a/scripts/diff.sh
+++ b/scripts/diff.sh
@@ -14,9 +14,11 @@ fi;
 
 migration="./migrations/${base}_to_${head}.sql"
 
-localhost=${DOCKER_NETWORK_HOST:-localhost}
-base_url="postgresql://$POSTGRES_USER:$POSTGRES_PASSWORD@$localhost:5432/dnim"
-head_url="postgresql://$POSTGRES_USER:$POSTGRES_PASSWORD@$localhost:5433/dnim"
+pg_host_base=${PG_HOST_BASE:-localhost:5432}
+pg_host_head=${PG_HOST_HEAD:-localhost:5433}
+
+base_url="postgresql://$POSTGRES_USER:$POSTGRES_PASSWORD@$pg_host_base/dnim"
+head_url="postgresql://$POSTGRES_USER:$POSTGRES_PASSWORD@$pg_host_head/dnim"
 
 if [[ -z "$base" ]] || [[ -z "$head" ]]; then
   echo "revisions to diff are required ex. ./scripts/diff.sh abc bcd" 1>&2;