From 31b1ab20b7491279dedb35e42e05271df7211140 Mon Sep 17 00:00:00 2001 From: Dalton Hubble Date: Wed, 3 Jun 2020 21:59:26 -0700 Subject: [PATCH] Update alpine base image from v3.11 to v3.12 --- CHANGES.md | 2 +- Dockerfile | 2 +- contrib/dnsmasq/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 0620101b..ee24831d 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -7,7 +7,7 @@ Notable changes between releases. * Update Matchbox container image publishing ([#795](https://github.com/poseidon/matchbox/pull/795)) * Publish Matchbox images from internal infra to Quay (`quay.io/poseidon/matchbox`) * Update Go version from v1.13.4 to v1.13.11 -* Update base image from `alpine:3.10` to `alpine:3.11` ([#784](https://github.com/poseidon/matchbox/pull/784)) +* Update base image from `alpine:3.10` to `alpine:3.12` ([#784](https://github.com/poseidon/matchbox/pull/784)) * Update Kubernetes manifests ([#791](https://github.com/poseidon/matchbox/pull/791)) * Include `contrib/k8s` in release tarballs ([#788](https://github.com/poseidon/matchbox/pull/788)) diff --git a/Dockerfile b/Dockerfile index 646e8c91..9e5abe8d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.11 +FROM docker.io/alpine:3.12 LABEL maintainer="Dalton Hubble " COPY bin/matchbox /matchbox EXPOSE 8080 diff --git a/contrib/dnsmasq/Dockerfile b/contrib/dnsmasq/Dockerfile index d17a7509..976b6560 100644 --- a/contrib/dnsmasq/Dockerfile +++ b/contrib/dnsmasq/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.11 +FROM docker.io/alpine:3.12 LABEL maintainer="Dalton Hubble " RUN apk -U add dnsmasq curl COPY tftpboot /var/lib/tftpboot