This commit is contained in:
parent
aa353c7ce4
commit
7b34a4333e
17
Dockerfile
17
Dockerfile
|
|
@ -40,7 +40,7 @@ ARG supautils_release=2.2.0
|
||||||
ARG wal_g_release=2.0.1
|
ARG wal_g_release=2.0.1
|
||||||
|
|
||||||
FROM nvcr.io/nvidia/tritonserver:24.04-py3-min as base
|
FROM nvcr.io/nvidia/tritonserver:24.04-py3-min as base
|
||||||
#FROM ubuntu:focal as base
|
|
||||||
RUN apt update -y && apt install -y \
|
RUN apt update -y && apt install -y \
|
||||||
curl \
|
curl \
|
||||||
gnupg \
|
gnupg \
|
||||||
|
|
@ -138,7 +138,7 @@ RUN arch=$([ "$TARGETARCH" = "arm64" ] && echo "aarch64" || echo "$TARGETARCH")
|
||||||
FROM base as gosu
|
FROM base as gosu
|
||||||
ARG TARGETARCH
|
ARG TARGETARCH
|
||||||
# Install dependencies
|
# 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 \
|
gnupg \
|
||||||
ca-certificates \
|
ca-certificates \
|
||||||
&& rm -rf /var/lib/apt/lists/*
|
&& 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
|
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
|
HEALTHCHECK --interval=2s --timeout=2s --retries=10 CMD pg_isready -U postgres -h localhost
|
||||||
STOPSIGNAL SIGINT
|
STOPSIGNAL SIGINT
|
||||||
|
|
@ -223,4 +229,7 @@ ENV LC_ALL en_US.UTF-8
|
||||||
ENV LC_CTYPE=C.UTF-8
|
ENV LC_CTYPE=C.UTF-8
|
||||||
ENV LC_COLLATE=C.UTF-8
|
ENV LC_COLLATE=C.UTF-8
|
||||||
ENV LOCALE_ARCHIVE /usr/lib/locale/locale-archive
|
ENV LOCALE_ARCHIVE /usr/lib/locale/locale-archive
|
||||||
CMD ["postgres", "-D", "/etc/postgresql"]
|
|
||||||
|
CMD ["-c", "supabase/postgres/supervisord.conf"]
|
||||||
|
#CMD ["postgres", "-D", "/etc/postgresql"]
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -15,14 +15,11 @@ serverurl=unix:///var/run/supervisor.sock
|
||||||
command=/bin/bash /supabase/postgres/wrapper.sh
|
command=/bin/bash /supabase/postgres/wrapper.sh
|
||||||
user=root
|
user=root
|
||||||
autorestart=true
|
autorestart=true
|
||||||
startsecs=5
|
|
||||||
stdout_logfile=/var/log/postgres.out.log
|
stdout_logfile=/var/log/postgres.out.log
|
||||||
stderr_logfile=/var/log/postgres.err.log
|
stderr_logfile=/var/log/postgres.err.log
|
||||||
environment=
|
environment=POSTGRES_PASSWORD="postgres"
|
||||||
POSTGRES_USER="supabase_admin",
|
|
||||||
POSTGRES_PASSWORD="postgres",
|
|
||||||
POSTGRES_DB="postgres",
|
|
||||||
PGDATA="/var/lib/postgresql/data"
|
|
||||||
|
|
||||||
|
|
||||||
# [program:kong]
|
# [program:kong]
|
||||||
|
|
|
||||||
12
wrapper.sh
12
wrapper.sh
|
|
@ -1,14 +1,4 @@
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
set -e
|
set -e
|
||||||
|
|
||||||
# 显式导出 supervisord 注入的环境变量(保险起见)
|
exec /usr/local/bin/docker-entrypoint.sh postgres -D /etc/postgresql
|
||||||
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"
|
|
||||||
Loading…
Reference in New Issue