PMM-13671 Update client image labels

percona · Jan 17, 2025 · b7514b2 · b7514b2
1 parent 8bffe53
commit b7514b2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/build/docker/client/Dockerfile b/build/docker/client/Dockerfile
@@ -10,14 +10,17 @@ RUN groupadd -g 1002 pmm-agent && \
 FROM redhat/ubi9-micro
 
 ARG VERSION
+ARG RELEASE
 ARG BUILD_DATE
 
-LABEL org.opencontainers.image.created=${BUILD_DATE} \
+LABEL build-date=${BUILD_DATE} \
+      org.opencontainers.image.created=${BUILD_DATE} \
       org.opencontainers.image.licenses=Apache-2.0 \
       org.opencontainers.image.title="Percona Monitoring and Management Client" \
       org.opencontainers.image.vendor="Percona, LLC" \
       org.opencontainers.image.version=${VERSION} \
       version=${VERSION} \
+      release=${RELEASE} \
       name="percona/pmm-client" \
       summary="PMM Client image" \
       description="The client container for Percona Monitoring and Management" \

diff --git a/build/scripts/build-client-docker b/build/scripts/build-client-docker
@@ -17,11 +17,9 @@ if [ -z "${DOCKER_CLIENT_TAG}" ]; then
     DOCKER_CLIENT_TAG=perconalab/pmm-client-fb:${full_pmm_version}
 fi
 
-
-CLIENT_IMAGE_VERSION=`echo $DOCKER_CLIENT_TAG | cut -d ':' -f2`
-
 docker build --build-arg BUILD_DATE="`date --rfc-3339=seconds`" \
-             --build-arg VERSION="$CLIENT_IMAGE_VERSION" \
+             --build-arg VERSION=$(cat VERSION) \
+             --build-arg RELEASE=$(date +%s) \
              --squash \
              --no-cache \
              -f ${DOCKER_FILE_LOCATION}/${docker_file} \