build,images: Use base alpine image from versions for alert-logger

scality · Nov 14, 2022 · 3b31658 · 3b31658
1 parent 35cd40e
commit 3b31658
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,14 @@
 # CHANGELOG
 ## Release 124.0.1 (in development)
 
+### Bug fixes 
+
+- Actually bump the alpine base image used by `metalk8s-alert-logger`
+  image to `alpine:3.16.2` (this one was wrongly marked as upgraded
+  in [124.0.0](https://github.com/scality/metalk8s/releases/124.0.0)
+  changelog)
+  (PR[#3909](https://github.com/scality/metalk8s/pull/3909))
+
 ## Release 124.0.0
 
 ### Additions

diff --git a/buildchain/buildchain/image.py b/buildchain/buildchain/image.py
@@ -239,6 +239,10 @@ def _local_image(name: str, **kwargs: Any) -> targets.LocalImage:
 TO_BUILD: Tuple[targets.LocalImage, ...] = (
     _local_image(
         name="metalk8s-alert-logger",
+        build_args={
+            "BASE_IMAGE": versions.ALPINE_BASE_IMAGE,
+            "BASE_IMAGE_SHA256": versions.ALPINE_BASE_IMAGE_SHA256,
+        },
     ),
     _local_image(
         name="metalk8s-keepalived",

diff --git a/images/metalk8s-alert-logger/Dockerfile b/images/metalk8s-alert-logger/Dockerfile
@@ -1,7 +1,9 @@
+# SHA256 digest of the base image
+ARG BASE_IMAGE_SHA256
+ARG BASE_IMAGE=docker.io/alpine
+
 ARG BUILD_IMAGE_NAME=golang
 ARG BUILD_IMAGE_TAG=1.16.0-alpine
-ARG RUN_IMAGE_NAME=alpine
-ARG RUN_IMAGE_TAG=3.13.10
 FROM ${BUILD_IMAGE_NAME}:${BUILD_IMAGE_TAG} AS builder
 
 ENV CGO_ENABLED=0
@@ -19,7 +21,7 @@ RUN sed -i "s/@@ALERTMANAGER_VERSION@@/$ALERTMANAGER_VERSION/g" go.mod \
   && go mod tidy \
   && go install
 
-FROM ${RUN_IMAGE_NAME}:${RUN_IMAGE_TAG}
+FROM ${BASE_IMAGE}@sha256:${BASE_IMAGE_SHA256}
 
 MAINTAINER moonshot-platform <moonshot-platform@scality.com>