From ba05026037b5880d0085d8582207ff119959aed9 Mon Sep 17 00:00:00 2001 From: Manuel Alejandro de Brito Fontes Date: Thu, 14 Jan 2021 23:50:51 -0300 Subject: [PATCH] Update alpine to 3.13 --- docs/examples/customization/sysctl/patch.json | 2 +- images/cfssl/rootfs/Dockerfile | 2 +- images/httpbin/rootfs/Dockerfile | 2 +- images/nginx/rootfs/Dockerfile | 8 +++++--- images/nginx/rootfs/build.sh | 3 --- 5 files changed, 8 insertions(+), 9 deletions(-) diff --git a/docs/examples/customization/sysctl/patch.json b/docs/examples/customization/sysctl/patch.json index e74b3828a..d0cf1f9ae 100644 --- a/docs/examples/customization/sysctl/patch.json +++ b/docs/examples/customization/sysctl/patch.json @@ -4,7 +4,7 @@ "spec": { "initContainers": [{ "name": "sysctl", - "image": "alpine:3.10", + "image": "alpine:3.13", "securityContext": { "privileged": true }, diff --git a/images/cfssl/rootfs/Dockerfile b/images/cfssl/rootfs/Dockerfile index 5713a9073..f12a1c776 100644 --- a/images/cfssl/rootfs/Dockerfile +++ b/images/cfssl/rootfs/Dockerfile @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM alpine:3.12 +FROM alpine:3.13 RUN echo "@testing http://nl.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories RUN apk add --no-cache \ diff --git a/images/httpbin/rootfs/Dockerfile b/images/httpbin/rootfs/Dockerfile index 3405bf68b..9ef9ccc2b 100644 --- a/images/httpbin/rootfs/Dockerfile +++ b/images/httpbin/rootfs/Dockerfile @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM alpine:3.12 +FROM alpine:3.13 ENV LC_ALL=C.UTF-8 ENV LANG=C.UTF-8 diff --git a/images/nginx/rootfs/Dockerfile b/images/nginx/rootfs/Dockerfile index 67d639ee2..e639687f1 100644 --- a/images/nginx/rootfs/Dockerfile +++ b/images/nginx/rootfs/Dockerfile @@ -13,15 +13,17 @@ # limitations under the License. -FROM alpine:3.12 as builder +FROM alpine:3.13 as builder COPY . / -RUN apk add -U bash \ +RUN apk update \ + && apk upgrade \ + && apk add -U bash \ && /build.sh # Use a multi-stage build -FROM alpine:3.12 +FROM alpine:3.13 ENV PATH=$PATH:/usr/local/luajit/bin:/usr/local/nginx/sbin:/usr/local/nginx/bin diff --git a/images/nginx/rootfs/build.sh b/images/nginx/rootfs/build.sh index c2c957963..167485a46 100755 --- a/images/nginx/rootfs/build.sh +++ b/images/nginx/rootfs/build.sh @@ -75,9 +75,6 @@ get_src() rm -rf "$f" } -apk update -apk upgrade - # install required packages to build apk add \ bash \