Explorar o código

build: pin base docker image to stable-20240612-slim

latest version of 12-slim as of today is configured
to fetch i386 packages
Ivan Dyachkov hai 1 ano
pai
achega
8a42d664b8

+ 2 - 2
.github/workflows/build_and_push_docker_images.yaml

@@ -165,7 +165,7 @@ jobs:
           DOCKER_PUSH: false
           DOCKER_BUILD_NOCACHE: true
           DOCKER_LOAD: true
-          EMQX_RUNNER: 'public.ecr.aws/debian/debian:12-slim'
+          EMQX_RUNNER: 'public.ecr.aws/debian/debian:stable-20240612-slim'
           EMQX_DOCKERFILE: 'deploy/docker/Dockerfile'
           PKG_VSN: ${{ needs.build.outputs.PKG_VSN }}
           EMQX_BUILDER_VERSION: ${{ inputs.builder_vsn }}
@@ -214,7 +214,7 @@ jobs:
           DOCKER_BUILD_NOCACHE: false
           DOCKER_PLATFORMS: linux/amd64,linux/arm64
           DOCKER_LOAD: false
-          EMQX_RUNNER: 'public.ecr.aws/debian/debian:12-slim'
+          EMQX_RUNNER: 'public.ecr.aws/debian/debian:stable-20240612-slim'
           EMQX_DOCKERFILE: 'deploy/docker/Dockerfile'
           PKG_VSN: ${{ needs.build.outputs.PKG_VSN }}
           EMQX_BUILDER_VERSION: ${{ inputs.builder_vsn }}

+ 1 - 1
Makefile

@@ -8,7 +8,7 @@ BUILD = $(CURDIR)/build
 SCRIPTS = $(CURDIR)/scripts
 export EMQX_RELUP ?= true
 export EMQX_DEFAULT_BUILDER = ghcr.io/emqx/emqx-builder/5.3-8:1.15.7-26.2.5-2-debian12
-export EMQX_DEFAULT_RUNNER = public.ecr.aws/debian/debian:12-slim
+export EMQX_DEFAULT_RUNNER = public.ecr.aws/debian/debian:stable-20240612-slim
 export EMQX_REL_FORM ?= tgz
 export QUICER_DOWNLOAD_FROM_RELEASE = 1
 ifeq ($(OS),Windows_NT)

+ 1 - 1
deploy/docker/Dockerfile

@@ -1,5 +1,5 @@
 ARG BUILD_FROM=ghcr.io/emqx/emqx-builder/5.3-8:1.15.7-26.2.5-2-debian12
-ARG RUN_FROM=public.ecr.aws/debian/debian:12-slim
+ARG RUN_FROM=public.ecr.aws/debian/debian:stable-20240612-slim
 ARG SOURCE_TYPE=src # tgz
 
 FROM ${BUILD_FROM} as builder_src