yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chore(docker): update to use alpine 3.12 

3.12 is our builder image base
This commit is contained in:
Zaiming Shi 2021-01-28 10:45:06 +01:00 committed by JianBo He
parent 5d5617a911
commit 469afbd8bb
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
deploy/docker/Dockerfile
View File

@ -1,5 +1,5 @@
ARG BUILD_FROM=emqx/build-env:erl23.2.2-alpine-amd64 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 FROM ${BUILD_FROM} AS builder
ARG QEMU_ARCH=x86_64 ARG QEMU_ARCH=x86_64

2
docker.mk
View File

@ -55,7 +55,7 @@ docker-build:
@docker build --no-cache \ @docker build --no-cache \
--build-arg PKG_VSN=$(PKG_VSN) \ --build-arg PKG_VSN=$(PKG_VSN) \
--build-arg BUILD_FROM=emqx/build-env:erl23.2.2-alpine-$(ARCH) \ --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 EMQX_NAME=$(EMQX_NAME) \
--build-arg QEMU_ARCH=$(QEMU_ARCH) \ --build-arg QEMU_ARCH=$(QEMU_ARCH) \
--tag $(TARGET):build-$(OS)-$(ARCH) \ --tag $(TARGET):build-$(OS)-$(ARCH) \