From 7b34a4333ef1c55d546c80bcfaf7abdda9880e42 Mon Sep 17 00:00:00 2001
From: hailin <hailin@gdzx.xyz>
Date: Sat, 17 May 2025 11:58:02 +0800
Subject: [PATCH] .

---
 Dockerfile       | 17 +++++++++++++----
 supervisord.conf |  9 +++------
 wrapper.sh       | 12 +-----------
 3 files changed, 17 insertions(+), 21 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 65d8797..b33bf4f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -40,7 +40,7 @@ ARG supautils_release=2.2.0
 ARG wal_g_release=2.0.1
 
 FROM nvcr.io/nvidia/tritonserver:24.04-py3-min as base
-#FROM ubuntu:focal as base
+
 RUN apt update -y && apt install -y \
     curl \
     gnupg \
@@ -138,7 +138,7 @@ RUN arch=$([ "$TARGETARCH" = "arm64" ] && echo "aarch64" || echo "$TARGETARCH")
 FROM base as gosu
 ARG TARGETARCH
 # Install dependencies
-RUN apt-get update && apt-get install -y --no-install-recommends \
+RUN apt-get update && apt-get install -y --no-install-recommends supervisor && \
    gnupg \
    ca-certificates \
    && rm -rf /var/lib/apt/lists/*
@@ -202,7 +202,13 @@ ADD --chmod=0755 \
 
 RUN mkdir -p /var/run/postgresql && chown postgres:postgres /var/run/postgresql
 
-ENTRYPOINT ["docker-entrypoint.sh"]
+RUN mkdir -p /supabase/storage-api && mkdir -p /supabase/postgres && mkdir -p /supabase/kong && mkdir -p /supabase/gotrue && mkdir -p /supabase/postgrest
+COPY wrapper.sh /supabase/postgres/
+COPY supervisord.conf /supabase/postgres/
+RUN chmod +x /supabase/postgres/wrapper.sh
+
+#ENTRYPOINT ["docker-entrypoint.sh"]
+ENTRYPOINT ["supervisord"]
 
 HEALTHCHECK --interval=2s --timeout=2s --retries=10 CMD pg_isready -U postgres -h localhost
 STOPSIGNAL SIGINT
@@ -223,4 +229,7 @@ ENV LC_ALL en_US.UTF-8
 ENV LC_CTYPE=C.UTF-8
 ENV LC_COLLATE=C.UTF-8
 ENV LOCALE_ARCHIVE /usr/lib/locale/locale-archive
-CMD ["postgres", "-D", "/etc/postgresql"]
+
+CMD ["-c", "supabase/postgres/supervisord.conf"]
+#CMD ["postgres", "-D", "/etc/postgresql"]
+
diff --git a/supervisord.conf b/supervisord.conf
index 5043379..5982174 100644
--- a/supervisord.conf
+++ b/supervisord.conf
@@ -15,14 +15,11 @@ serverurl=unix:///var/run/supervisor.sock
 command=/bin/bash /supabase/postgres/wrapper.sh
 user=root
 autorestart=true
-startsecs=5
 stdout_logfile=/var/log/postgres.out.log
 stderr_logfile=/var/log/postgres.err.log
-environment=
-    POSTGRES_USER="supabase_admin",
-    POSTGRES_PASSWORD="postgres",
-    POSTGRES_DB="postgres",
-    PGDATA="/var/lib/postgresql/data"
+environment=POSTGRES_PASSWORD="postgres"
+
+
 
     
 # [program:kong]
diff --git a/wrapper.sh b/wrapper.sh
index 94e1e6d..1c6d72f 100644
--- a/wrapper.sh
+++ b/wrapper.sh
@@ -1,14 +1,4 @@
 #!/bin/bash
 set -e
 
-# 显式导出 supervisord 注入的环境变量（保险起见）
-export POSTGRES_USER="${POSTGRES_USER:-postgres}"
-export POSTGRES_PASSWORD="${POSTGRES_PASSWORD:-}"
-export POSTGRES_DB="${POSTGRES_DB:-$POSTGRES_USER}"
-export PGDATA="${PGDATA:-/var/lib/postgresql/data}"
-
-# 清除旧的 pid 文件（如果存在）
-rm -f "$PGDATA/postmaster.pid"
-
-# 执行原始 entrypoint（注意 exec，防止 wrapper.sh 占用 PID 1）
-exec /usr/local/bin/docker-entrypoint.sh postgres -D "$PGDATA"
+exec /usr/local/bin/docker-entrypoint.sh postgres -D /etc/postgresql
\ No newline at end of file