Merge pull request #643 from hawksight/debian-trust-update

feat: Bump the ca-certificates package to 20230311+deb12u1

Author: SgtCoDFish

make/00_debian_bookworm_version.mk

@@ -15,7 +15,7 @@
 # WARNING: Changing this file triggers a build and release of the Debian trust package for Bookworm (Debian 12)
 #
 # This file is used to store the latest version of the debian trust package and the DEBIAN_BUNDLE_BOOKWORM_VERSION
-# variable is automatically updated by the `upgrade-debian-trust-package-version` target and cron GH action.
+# variable is automatically updated by the `upgrade-debian-trust-package-bookworm-version` target and cron GH action.
 
-DEBIAN_BUNDLE_BOOKWORM_VERSION=20230311.0
+DEBIAN_BUNDLE_BOOKWORM_VERSION := 20230311+deb12u1.0
 DEBIAN_BUNDLE_BOOKWORM_SOURCE_IMAGE=docker.io/library/debian:12-slim

make/00_mod.mk

@@ -47,7 +47,8 @@ go_package_debian_bookworm_mod_dir := ./trust-packages/debian
 go_package_debian_bookworm_ldflags :=
 oci_package_debian_bookworm_base_image_flavor := static
 oci_package_debian_bookworm_image_name := quay.io/jetstack/trust-pkg-debian-bookworm
-oci_package_debian_bookworm_image_tag := $(DEBIAN_BUNDLE_BOOKWORM_VERSION)
+# '+' characters are not valid in docker image names. Transform it to a '.' for images
+oci_package_debian_bookworm_image_tag := $(shell echo $(DEBIAN_BUNDLE_BOOKWORM_VERSION) | tr '+' '-')
 oci_package_debian_bookworm_image_name_development := cert-manager.local/trust-pkg-debian-bookworm
 debian_bookworm_package_layer := $(bin_dir)/scratch/debian-trust-package-bookworm
 oci_package_debian_bookworm_additional_layers += $(debian_bookworm_package_layer)

make/debian-trust-package-fetch.sh

@@ -88,6 +88,7 @@ fi
 target_ca_certificates_version="${TARGET_DEBIAN_BUNDLE_VERSION%.*}"
 
 echo "+++ fetching latest version of ca-certificates package"
+echo "+++ target version of ca-certificates is '$target_ca_certificates_version'"
 
 TMP_DIR=$(mktemp -d)