From 469afbd8bb9a2955c4750065e330441aab5558d5 Mon Sep 17 00:00:00 2001 From: Zaiming Shi Date: Thu, 28 Jan 2021 10:45:06 +0100 Subject: [PATCH] chore(docker): update to use alpine 3.12 3.12 is our builder image base --- deploy/docker/Dockerfile | 2 +- docker.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/deploy/docker/Dockerfile b/deploy/docker/Dockerfile index 3de2ada97..30cae8b89 100644 --- a/deploy/docker/Dockerfile +++ b/deploy/docker/Dockerfile @@ -1,5 +1,5 @@ ARG BUILD_FROM=emqx/build-env:erl23.2.2-alpine-amd64 -ARG RUN_FROM=alpine:3.11 +ARG RUN_FROM=alpine:3.12 FROM ${BUILD_FROM} AS builder ARG QEMU_ARCH=x86_64 diff --git a/docker.mk b/docker.mk index 60e96ae39..d3e04c2e7 100644 --- a/docker.mk +++ b/docker.mk @@ -55,7 +55,7 @@ docker-build: @docker build --no-cache \ --build-arg PKG_VSN=$(PKG_VSN) \ --build-arg BUILD_FROM=emqx/build-env:erl23.2.2-alpine-$(ARCH) \ - --build-arg RUN_FROM=$(ARCH)/alpine:3.11 \ + --build-arg RUN_FROM=$(ARCH)/alpine:3.12 \ --build-arg EMQX_NAME=$(EMQX_NAME) \ --build-arg QEMU_ARCH=$(QEMU_ARCH) \ --tag $(TARGET):build-$(OS)-$(ARCH) \