From e411314cbc0c516a6b89999a5b4c10791213daee Mon Sep 17 00:00:00 2001 From: Toby Bellwood Date: Fri, 25 Mar 2022 13:11:16 +1100 Subject: [PATCH 1/2] Revert "use official openresty package image instead of source image" --- images/nginx/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/nginx/Dockerfile b/images/nginx/Dockerfile index 5080128d6..f74328ae2 100644 --- a/images/nginx/Dockerfile +++ b/images/nginx/Dockerfile @@ -1,7 +1,7 @@ ARG IMAGE_REPO FROM ${IMAGE_REPO:-lagoon}/commons as commons # Alpine 3.12 per https://github.com/openresty/docker-openresty/blob/1.19.3.1-0/alpine/Dockerfile -FROM openresty/openresty:1.19.9.1-alpine-apk +FROM openresty/openresty:1.19.9.1-alpine LABEL org.opencontainers.image.authors="The Lagoon Authors" maintainer="The Lagoon Authors" LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images" repository="https://github.com/uselagoon/lagoon-images" From 1fdb048de6a62e636ceb8093e48ba5ea8985d166 Mon Sep 17 00:00:00 2001 From: Toby Bellwood Date: Sat, 26 Mar 2022 09:34:22 +1100 Subject: [PATCH 2/2] pin to 1.19.9.1-9-alpine-apk --- images/nginx/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/nginx/Dockerfile b/images/nginx/Dockerfile index f74328ae2..dce9519af 100644 --- a/images/nginx/Dockerfile +++ b/images/nginx/Dockerfile @@ -1,7 +1,7 @@ ARG IMAGE_REPO FROM ${IMAGE_REPO:-lagoon}/commons as commons # Alpine 3.12 per https://github.com/openresty/docker-openresty/blob/1.19.3.1-0/alpine/Dockerfile -FROM openresty/openresty:1.19.9.1-alpine +FROM openresty/openresty:1.19.9.1-9-alpine-apk LABEL org.opencontainers.image.authors="The Lagoon Authors" maintainer="The Lagoon Authors" LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images" repository="https://github.com/uselagoon/lagoon-images"