From a0a5d6bc67fad182b0fff167373cba1cb37d9af1 Mon Sep 17 00:00:00 2001
From: Kentaro Ohkouchi <nanasess@fsm.ne.jp>
Date: Thu, 3 Oct 2024 00:33:58 +0900
Subject: [PATCH 1/2] =?UTF-8?q?PostgreSQL=20=E3=81=AE=E3=83=98=E3=83=AB?=
 =?UTF-8?q?=E3=82=B9=E3=83=81=E3=82=A7=E3=83=83=E3=82=AF=E3=82=92=E4=BF=AE?=
 =?UTF-8?q?=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

PostgreSQL17 サーバーへ PostgreSQL17未満の psql で `\l` を実行すると以
下のエラーが発生する

```
psql --version
psql (PostgreSQL) 16.4
psql -h 127.0.0.1 -p 15432 -U eccube_db_user eccube_db
eccube_db=# \l
ERROR:  column d.daticulocale does not exist
行 8:   d.daticulocale as "ICU Locale",
        ^
HINT:  Perhaps you meant to reference the column "d.datlocale".
```

副作用の少ない `SELECT 1` に変更する.
また、 docker compose のヘルえスチェックが有効になるよう `condition: service_healthy` を追加する
---
 docker-compose.pgsql.yml      | 8 +++++---
 dockerbuild/wait-for-pgsql.sh | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/docker-compose.pgsql.yml b/docker-compose.pgsql.yml
index b34aa6a794..63cd304cca 100644
--- a/docker-compose.pgsql.yml
+++ b/docker-compose.pgsql.yml
@@ -7,7 +7,8 @@ services:
     command: apache2-foreground
     entrypoint: /wait-for-pgsql.sh
     depends_on:
-      - postgres
+      postgres:
+        condition: service_healthy
     environment:
       TZ: Asia/Tokyo
       PHP_POST_MAX_SIZE: 10M
@@ -39,8 +40,9 @@ services:
       - POSTGRES_DB=eccube_db
       - POSTGRES_USER=eccube_db_user
       - POSTGRES_PASSWORD=password
-      - POSTGRES_HOST_AUTH_METHOD=md5
-      - POSTGRES_INITDB_ARGS=--auth-host=md5
+      # 古いクライアント用の設定
+      # - POSTGRES_HOST_AUTH_METHOD=md5
+      # - POSTGRES_INITDB_ARGS=--auth-host=md5
     ports:
       - 15432:5432
     volumes:
diff --git a/dockerbuild/wait-for-pgsql.sh b/dockerbuild/wait-for-pgsql.sh
index 6d6ccf107c..b82f62dd36 100644
--- a/dockerbuild/wait-for-pgsql.sh
+++ b/dockerbuild/wait-for-pgsql.sh
@@ -2,7 +2,7 @@
 set -e
 
 export PGPASSWORD=$DB_PASSWORD
-until psql -h "${DB_SERVER}" -U "${DB_USER}" -d "template1" -c '\l'; do
+until psql -h "${DB_SERVER}" -U "${DB_USER}" -d "template1" -c 'SELECT 1'; do
   >&2 echo "Postgres is unavailable - sleeping"
   printf "."
   sleep 1

From 566278f77ead5c9b03e64f296b24f57b6cc5796d Mon Sep 17 00:00:00 2001
From: Kentaro Ohkouchi <nanasess@fsm.ne.jp>
Date: Thu, 3 Oct 2024 09:26:02 +0900
Subject: [PATCH 2/2] =?UTF-8?q?master=20=E3=83=96=E3=83=A9=E3=83=B3?=
 =?UTF-8?q?=E3=83=81=E3=81=AE=E3=82=A4=E3=83=A1=E3=83=BC=E3=82=B8=E3=82=92?=
 =?UTF-8?q?=E5=8F=96=E5=BE=97=E3=81=97=E3=81=A6=E3=81=97=E3=81=BE=E3=81=86?=
 =?UTF-8?q?=E3=81=9F=E3=82=81=E3=80=81=E4=B8=80=E6=97=A6=20PostgreSQL16=20?=
 =?UTF-8?q?=E3=82=92=E6=8C=87=E5=AE=9A=E3=81=99=E3=82=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docker-compose.pgsql.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-compose.pgsql.yml b/docker-compose.pgsql.yml
index 63cd304cca..7429eb80da 100644
--- a/docker-compose.pgsql.yml
+++ b/docker-compose.pgsql.yml
@@ -34,7 +34,7 @@ services:
       PASSWORD_HASH_ALGOS: sha256
 
   postgres:
-    image: postgres
+    image: postgres:16
     environment:
       - TZ=Asia/Tokyo
       - POSTGRES_DB=eccube_db