diff --git a/Dockerfile b/Dockerfile index 30f6fd4..aef9a2d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,5 @@ # syntax=docker/dockerfile:1.6 +#------------------------------- goture------------------------------------------------s FROM golang:1.22.3-alpine3.20 as authbuild ENV GO111MODULE=on ENV CGO_ENABLED=0 @@ -19,7 +20,7 @@ COPY auth_v2.169.0/. ./ RUN RELEASE_VERSION=1.22.3 make build - +#------------------------------------------------- storage-api -------------------------------------- # Base stage for shared environment setup FROM node:20-alpine3.20 as s3base RUN apk add --no-cache g++ make python3 @@ -114,12 +115,6 @@ RUN chmod +x /usr/bin/postgrest #CMD ["postgrest"] - - - - - - #========================================================================== PostgreSQL ============================================================= ARG postgresql_major=15 ARG postgresql_release=${postgresql_major}.1 @@ -192,11 +187,8 @@ WORKDIR /nixpg RUN nix profile install .#psql_15/bin - - WORKDIR / - RUN mkdir -p /usr/lib/postgresql/bin \ /usr/lib/postgresql/share/postgresql \ /usr/share/postgresql \ @@ -321,12 +313,13 @@ ADD --chmod=0755 \ /usr/local/bin/ RUN mkdir -p /var/run/postgresql && chown postgres:postgres /var/run/postgresql +RUN COPY supervisord.conf ./ -ENTRYPOINT ["docker-entrypoint.sh"] +#ENTRYPOINT ["docker-entrypoint.sh"] HEALTHCHECK --interval=2s --timeout=2s --retries=10 CMD pg_isready -U postgres -h localhost STOPSIGNAL SIGINT -EXPOSE 5432 +#EXPOSE 5432 ENV POSTGRES_HOST=/var/run/postgresql ENV POSTGRES_USER=supabase_admin diff --git a/supervisord.conf b/supervisord.conf index d93fc84..23d6f8e 100644 --- a/supervisord.conf +++ b/supervisord.conf @@ -29,7 +29,7 @@ stderr_logfile=/var/log/postgrest.err.log stdout_logfile=/var/log/postgrest.out.log [program:storage-api] -command=/supabase/storage-api/start.sh +command=/usr/bin/node /supabase/storage-api/dist/start/server.js autorestart=true stderr_logfile=/var/log/storage-api.err.log stdout_logfile=/var/log/storage-api.out.log