|
|
@ -87,7 +87,12 @@ ARG BUILDOS
|
|
|
|
ARG GOMPLATE_VERSION
|
|
|
|
ARG GOMPLATE_VERSION
|
|
|
|
|
|
|
|
|
|
|
|
RUN set -ex \
|
|
|
|
RUN set -ex \
|
|
|
|
&& curl --silent --show-error --location --output /usr/local/bin/gomplate https://github.com/hairyhenderson/gomplate/releases/download/${GOMPLATE_VERSION}/gomplate_${BUILDOS}-${BUILDARCH} \
|
|
|
|
&& curl \
|
|
|
|
|
|
|
|
--silent \
|
|
|
|
|
|
|
|
--show-error \
|
|
|
|
|
|
|
|
--location \
|
|
|
|
|
|
|
|
--output /usr/local/bin/gomplate \
|
|
|
|
|
|
|
|
https://github.com/hairyhenderson/gomplate/releases/download/${GOMPLATE_VERSION}/gomplate_${BUILDOS}-${BUILDARCH} \
|
|
|
|
&& chmod +x /usr/local/bin/gomplate \
|
|
|
|
&& chmod +x /usr/local/bin/gomplate \
|
|
|
|
&& /usr/local/bin/gomplate --version
|
|
|
|
&& /usr/local/bin/gomplate --version
|
|
|
|
|
|
|
|
|
|
|
@ -278,8 +283,7 @@ RUN --mount=type=cache,id=pixelfed-apt-lists-${PHP_VERSION}-${PHP_DEBIAN_RELEASE
|
|
|
|
&& gpg1 --export "$NGINX_GPGKEY" > "$NGINX_GPGKEY_PATH" \
|
|
|
|
&& gpg1 --export "$NGINX_GPGKEY" > "$NGINX_GPGKEY_PATH" \
|
|
|
|
&& echo "deb [signed-by=${NGINX_GPGKEY_PATH}] https://nginx.org/packages/mainline/debian/ ${PHP_DEBIAN_RELEASE} nginx" >> /etc/apt/sources.list.d/nginx.list \
|
|
|
|
&& echo "deb [signed-by=${NGINX_GPGKEY_PATH}] https://nginx.org/packages/mainline/debian/ ${PHP_DEBIAN_RELEASE} nginx" >> /etc/apt/sources.list.d/nginx.list \
|
|
|
|
&& apt-get update \
|
|
|
|
&& apt-get update \
|
|
|
|
&& apt-get install -y --no-install-recommends \
|
|
|
|
&& apt-get install -y --no-install-recommends nginx=${NGINX_VERSION}*
|
|
|
|
nginx=${NGINX_VERSION}*
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# copy docker entrypoints from the *real* nginx image directly
|
|
|
|
# copy docker entrypoints from the *real* nginx image directly
|
|
|
|
COPY --link --from=nginx-image /docker-entrypoint.d /docker/entrypoint.d/
|
|
|
|
COPY --link --from=nginx-image /docker-entrypoint.d /docker/entrypoint.d/
|
|
|
|