From cc579a5937837936c37611a0a9913036de94b0a7 Mon Sep 17 00:00:00 2001 From: hailin Date: Sat, 17 May 2025 23:11:08 +0800 Subject: [PATCH] . --- Dockerfile | 88 +++++++++++++++++++++++++++--------------------------- 1 file changed, 44 insertions(+), 44 deletions(-) diff --git a/Dockerfile b/Dockerfile index 7f2b8e6..f290772 100644 --- a/Dockerfile +++ b/Dockerfile @@ -334,54 +334,54 @@ COPY --from=s3final dist /supabase/storage-api/dist COPY --from=s3final migrations /supabase/storage-api/migrations #=========================================== kong ========================================================= -# ARG ASSET=ce -# ENV ASSET $ASSET +ARG ASSET=ce +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 -# ENV KONG_VERSION $KONG_VERSION +ARG KONG_VERSION=2.8.1 +ENV KONG_VERSION $KONG_VERSION -# ARG KONG_AMD64_SHA="10d12d23e5890414d666663094d51a42de41f8a9806fbc0baaf9ac4d37794361" -# ARG KONG_ARM64_SHA="61c13219ef64dac9aeae5ae775411e8cfcd406f068cf3e75d463f916ae6513cb" +ARG KONG_AMD64_SHA="10d12d23e5890414d666663094d51a42de41f8a9806fbc0baaf9ac4d37794361" +ARG KONG_ARM64_SHA="61c13219ef64dac9aeae5ae775411e8cfcd406f068cf3e75d463f916ae6513cb" -# # hadolint ignore=DL3015 -# RUN set -ex; \ -# arch=$(dpkg --print-architecture); \ -# case "${arch}" in \ -# amd64) KONG_SHA256=$KONG_AMD64_SHA ;; \ -# arm64) KONG_SHA256=$KONG_ARM64_SHA ;; \ -# esac; \ -# apt-get update \ -# && if [ "$ASSET" = "ce" ] ; then \ -# apt-get install -y curl \ -# && UBUNTU_CODENAME=focal \ -# && 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 \ -# && apt-get purge -y curl \ -# && echo "$KONG_SHA256 /tmp/kong.deb" | sha256sum -c -; \ -# 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) -# apt-get upgrade -y ; \ -# fi; \ -# apt-get install -y --no-install-recommends unzip git \ -# # 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 -# # and that our CI does not diverge from our docs. -# && apt install --yes /tmp/kong.deb \ -# && rm -rf /var/lib/apt/lists/* \ -# && rm -rf /tmp/kong.deb \ -# && chown kong:0 /usr/local/bin/kong \ -# && chown -R kong:0 /usr/local/kong \ -# && 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/lua \ -# && ln -s /usr/local/openresty/nginx/sbin/nginx /usr/local/bin/nginx \ -# && if [ "$ASSET" = "ce" ] ; then \ -# kong version ; \ -# fi +# hadolint ignore=DL3015 +RUN set -ex; \ + arch=$(dpkg --print-architecture); \ + case "${arch}" in \ + amd64) KONG_SHA256=$KONG_AMD64_SHA ;; \ + arm64) KONG_SHA256=$KONG_ARM64_SHA ;; \ + esac; \ + apt-get update \ + && if [ "$ASSET" = "ce" ] ; then \ + apt-get install -y curl \ + && UBUNTU_CODENAME=focal \ + && 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 \ + && apt-get purge -y curl \ + && echo "$KONG_SHA256 /tmp/kong.deb" | sha256sum -c -; \ + 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) + apt-get upgrade -y ; \ + fi; \ + apt-get install -y --no-install-recommends unzip git \ + # 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 + # and that our CI does not diverge from our docs. + && apt install --yes /tmp/kong.deb \ + && rm -rf /var/lib/apt/lists/* \ + && rm -rf /tmp/kong.deb \ + && chown kong:0 /usr/local/bin/kong \ + && chown -R kong:0 /usr/local/kong \ + && 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/lua \ + && ln -s /usr/local/openresty/nginx/sbin/nginx /usr/local/bin/nginx \ + && if [ "$ASSET" = "ce" ] ; then \ + kong version ; \ + 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