hailin
/
chatai
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

.

This commit is contained in:
hailin 2025-05-17 22:41:14 +08:00
parent 0e9705f5c5
commit ba3102cf71
2 changed files with 50 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
Dockerfile
View File

@ -334,54 +334,54 @@ COPY --from=s3final dist /supabase/storage-api/dist
COPY --from=s3final migrations /supabase/storage-api/migrations COPY --from=s3final migrations /supabase/storage-api/migrations
#=========================================== kong ========================================================= #=========================================== kong =========================================================
ARG ASSET=ce # ARG ASSET=ce
ENV ASSET $ASSET # ENV ASSET $ASSET
ARG EE_PORTS # ARG EE_PORTS
COPY docker-kong_v2.8.1/ubuntu/kong.deb /tmp/kong.deb # COPY docker-kong_v2.8.1/ubuntu/kong.deb /tmp/kong.deb
ARG KONG_VERSION=2.8.1 # ARG KONG_VERSION=2.8.1
ENV KONG_VERSION $KONG_VERSION # ENV KONG_VERSION $KONG_VERSION
ARG KONG_AMD64_SHA="10d12d23e5890414d666663094d51a42de41f8a9806fbc0baaf9ac4d37794361" # ARG KONG_AMD64_SHA="10d12d23e5890414d666663094d51a42de41f8a9806fbc0baaf9ac4d37794361"
ARG KONG_ARM64_SHA="61c13219ef64dac9aeae5ae775411e8cfcd406f068cf3e75d463f916ae6513cb" # ARG KONG_ARM64_SHA="61c13219ef64dac9aeae5ae775411e8cfcd406f068cf3e75d463f916ae6513cb"
# hadolint ignore=DL3015 # # hadolint ignore=DL3015
RUN set -ex; \ # RUN set -ex; \
arch=$(dpkg --print-architecture); \ # arch=$(dpkg --print-architecture); \
case "${arch}" in \ # case "${arch}" in \
amd64) KONG_SHA256=$KONG_AMD64_SHA ;; \ # amd64) KONG_SHA256=$KONG_AMD64_SHA ;; \
arm64) KONG_SHA256=$KONG_ARM64_SHA ;; \ # arm64) KONG_SHA256=$KONG_ARM64_SHA ;; \
esac; \ # esac; \
apt-get update \ # apt-get update \
&& if [ "$ASSET" = "ce" ] ; then \ # && if [ "$ASSET" = "ce" ] ; then \
apt-get install -y curl \ # apt-get install -y curl \
&& UBUNTU_CODENAME=focal \ # && UBUNTU_CODENAME=focal \
&& KONG_REPO=$(echo ${KONG_VERSION%.*} | sed 's/\.//') \ # && KONG_REPO=$(echo ${KONG_VERSION%.*} | sed 's/\.//') \
&& curl -fL https://packages.konghq.com/public/gateway-$KONG_REPO/deb/ubuntu/pool/$UBUNTU_CODENAME/main/k/ko/kong_$KONG_VERSION/kong_${KONG_VERSION}_$arch.deb -o /tmp/kong.deb \ # && curl -fL https://packages.konghq.com/public/gateway-$KONG_REPO/deb/ubuntu/pool/$UBUNTU_CODENAME/main/k/ko/kong_$KONG_VERSION/kong_${KONG_VERSION}_$arch.deb -o /tmp/kong.deb \
&& apt-get purge -y curl \ # && apt-get purge -y curl \
&& echo "$KONG_SHA256 /tmp/kong.deb" | sha256sum -c -; \ # && echo "$KONG_SHA256 /tmp/kong.deb" | sha256sum -c -; \
else \ # else \
# this needs to stay inside this "else" block so that it does not become part of the "official images" builds (https://github.com/docker-library/official-images/pull/11532#issuecomment-996219700) # # this needs to stay inside this "else" block so that it does not become part of the "official images" builds (https://github.com/docker-library/official-images/pull/11532#issuecomment-996219700)
apt-get upgrade -y ; \ # apt-get upgrade -y ; \
fi; \ # fi; \
apt-get install -y --no-install-recommends unzip git \ # apt-get install -y --no-install-recommends unzip git \
# Please update the ubuntu install docs if the below line is changed so that # # Please update the ubuntu install docs if the below line is changed so that
# end users can properly install Kong along with its required dependencies # # end users can properly install Kong along with its required dependencies
# and that our CI does not diverge from our docs. # # and that our CI does not diverge from our docs.
&& apt install --yes /tmp/kong.deb \ # && apt install --yes /tmp/kong.deb \
&& rm -rf /var/lib/apt/lists/* \ # && rm -rf /var/lib/apt/lists/* \
&& rm -rf /tmp/kong.deb \ # && rm -rf /tmp/kong.deb \
&& chown kong:0 /usr/local/bin/kong \ # && chown kong:0 /usr/local/bin/kong \
&& chown -R kong:0 /usr/local/kong \ # && chown -R kong:0 /usr/local/kong \
&& ln -s /usr/local/openresty/bin/resty /usr/local/bin/resty \ # && ln -s /usr/local/openresty/bin/resty /usr/local/bin/resty \
&& ln -s /usr/local/openresty/luajit/bin/luajit /usr/local/bin/luajit \ # && ln -s /usr/local/openresty/luajit/bin/luajit /usr/local/bin/luajit \
&& ln -s /usr/local/openresty/luajit/bin/luajit /usr/local/bin/lua \ # && ln -s /usr/local/openresty/luajit/bin/luajit /usr/local/bin/lua \
&& ln -s /usr/local/openresty/nginx/sbin/nginx /usr/local/bin/nginx \ # && ln -s /usr/local/openresty/nginx/sbin/nginx /usr/local/bin/nginx \
&& if [ "$ASSET" = "ce" ] ; then \ # && if [ "$ASSET" = "ce" ] ; then \
kong version ; \ # kong version ; \
fi # fi
COPY --chmod=0755 docker-kong_v2.8.1/ubuntu/docker-entrypoint.sh /supabase/kong/docker-entrypoint.sh # COPY --chmod=0755 docker-kong_v2.8.1/ubuntu/docker-entrypoint.sh /supabase/kong/docker-entrypoint.sh

12
supabase/postgres/supervisord.conf
View File

@ -44,12 +44,12 @@ autorestart=true
stderr_logfile=/var/log/storage-api.err.log stderr_logfile=/var/log/storage-api.err.log
stdout_logfile=/var/log/storage-api.out.log stdout_logfile=/var/log/storage-api.out.log
[program:kong] # [program:kong]
command=/bin/bash /supabase/kong/wrapper.sh # command=/bin/bash /supabase/kong/wrapper.sh
user=kong # user=kong
autorestart=true # autorestart=true
stdout_logfile=/var/log/kong.out.log # stdout_logfile=/var/log/kong.out.log
stderr_logfile=/var/log/kong.err.log # stderr_logfile=/var/log/kong.err.log