From f32dd6c9d7497e1fc3b603e333745a3a180ec8c1 Mon Sep 17 00:00:00 2001
From: bo0tzz <git@bo0tzz.me>
Date: Mon, 27 Jan 2025 20:37:23 +0100
Subject: [PATCH 1/2] fix: set dbname in psql entrypoint commands

---
 docker/sidekiq-entrypoint.sh | 2 +-
 docker/web-entrypoint.sh     | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docker/sidekiq-entrypoint.sh b/docker/sidekiq-entrypoint.sh
index 1083891b..3b851c4d 100644
--- a/docker/sidekiq-entrypoint.sh
+++ b/docker/sidekiq-entrypoint.sh
@@ -24,7 +24,7 @@ fi
 
 # Wait for the database to become available
 echo "⏳ Waiting for database to be ready..."
-until PGPASSWORD=$DATABASE_PASSWORD psql -h "$DATABASE_HOST" -p "$DATABASE_PORT" -U "$DATABASE_USERNAME" -c '\q'; do
+until PGPASSWORD=$DATABASE_PASSWORD psql -h "$DATABASE_HOST" -p "$DATABASE_PORT" -U "$DATABASE_USERNAME" -d "$DATABASE_NAME" -d "$DATABASE_NAME" -c '\q'; do
   >&2 echo "Postgres is unavailable - retrying..."
   sleep 2
 done
diff --git a/docker/web-entrypoint.sh b/docker/web-entrypoint.sh
index 230f91cc..5c82d1b0 100644
--- a/docker/web-entrypoint.sh
+++ b/docker/web-entrypoint.sh
@@ -29,14 +29,14 @@ rm -f $APP_PATH/tmp/pids/server.pid
 
 # Wait for the database to become available
 echo "⏳ Waiting for database to be ready..."
-until PGPASSWORD=$DATABASE_PASSWORD psql -h "$DATABASE_HOST" -p "$DATABASE_PORT" -U "$DATABASE_USERNAME" -c '\q'; do
+until PGPASSWORD=$DATABASE_PASSWORD psql -h "$DATABASE_HOST" -p "$DATABASE_PORT" -U "$DATABASE_USERNAME" -d "$DATABASE_NAME" -c '\q'; do
   >&2 echo "Postgres is unavailable - retrying..."
   sleep 2
 done
 echo "✅ PostgreSQL is ready!"
 
 # Create database if it doesn't exist
-if ! PGPASSWORD=$DATABASE_PASSWORD psql -h "$DATABASE_HOST" -p "$DATABASE_PORT" -U "$DATABASE_USERNAME" -c "SELECT 1 FROM pg_database WHERE datname='$DATABASE_NAME'" | grep -q 1; then
+if ! PGPASSWORD=$DATABASE_PASSWORD psql -h "$DATABASE_HOST" -p "$DATABASE_PORT" -U "$DATABASE_USERNAME" -d "$DATABASE_NAME" -c "SELECT 1 FROM pg_database WHERE datname='$DATABASE_NAME'" | grep -q 1; then
   echo "Creating database $DATABASE_NAME..."
   bundle exec rails db:create
 fi

From 078b278c9faa53f24cd8a82499bbfe69233bb385 Mon Sep 17 00:00:00 2001
From: bo0tzz <git@bo0tzz.me>
Date: Mon, 27 Jan 2025 20:41:40 +0100
Subject: [PATCH 2/2] fix copy paste mistake

---
 docker/sidekiq-entrypoint.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/sidekiq-entrypoint.sh b/docker/sidekiq-entrypoint.sh
index 3b851c4d..cc4e20cd 100644
--- a/docker/sidekiq-entrypoint.sh
+++ b/docker/sidekiq-entrypoint.sh
@@ -24,7 +24,7 @@ fi
 
 # Wait for the database to become available
 echo "⏳ Waiting for database to be ready..."
-until PGPASSWORD=$DATABASE_PASSWORD psql -h "$DATABASE_HOST" -p "$DATABASE_PORT" -U "$DATABASE_USERNAME" -d "$DATABASE_NAME" -d "$DATABASE_NAME" -c '\q'; do
+until PGPASSWORD=$DATABASE_PASSWORD psql -h "$DATABASE_HOST" -p "$DATABASE_PORT" -U "$DATABASE_USERNAME" -d "$DATABASE_NAME" -c '\q'; do
   >&2 echo "Postgres is unavailable - retrying..."
   sleep 2
 done