Skip to content

Commit 8528687

Browse files
Merge pull request #891 from erikgb/trust-image-tag-char-replace
Replace another illegal image tag character in trust image
2 parents 18c7b33 + b289b9e commit 8528687

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

make/00_mod.mk

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,8 @@ go_package_debian_bullseye_mod_dir := ./trust-packages/debian
3737
go_package_debian_bullseye_ldflags :=
3838
oci_package_debian_bullseye_base_image_flavor := static
3939
oci_package_debian_bullseye_image_name := quay.io/jetstack/cert-manager-package-debian
40-
oci_package_debian_bullseye_image_tag := $(shell echo $(DEBIAN_BULLSEYE_BUNDLE_VERSION) | tr '+' '-')
40+
# '+' and '~' characters are not valid in docker image tags. Transform them to '-' for image tags.
41+
oci_package_debian_bullseye_image_tag := $(shell echo $(DEBIAN_BULLSEYE_BUNDLE_VERSION) | tr '+~' '-')
4142
oci_package_debian_bullseye_image_name_development := cert-manager.local/trust-pkg-debian-bullseye
4243
debian_bullseye_package_layer := $(bin_dir)/scratch/debian-bullseye-trust-package
4344
oci_package_debian_bullseye_additional_layers += $(debian_bullseye_package_layer)
@@ -47,8 +48,8 @@ go_package_debian_bookworm_mod_dir := ./trust-packages/debian
4748
go_package_debian_bookworm_ldflags :=
4849
oci_package_debian_bookworm_base_image_flavor := static
4950
oci_package_debian_bookworm_image_name := quay.io/jetstack/trust-pkg-debian-bookworm
50-
# '+' characters are not valid in docker image names. Transform it to a '.' for images
51-
oci_package_debian_bookworm_image_tag := $(shell echo $(DEBIAN_BOOKWORM_BUNDLE_VERSION) | tr '+' '-')
51+
# '+' and '~' characters are not valid in docker image tags. Transform them to '-' for image tags.
52+
oci_package_debian_bookworm_image_tag := $(shell echo $(DEBIAN_BOOKWORM_BUNDLE_VERSION) | tr '+~' '-')
5253
oci_package_debian_bookworm_image_name_development := cert-manager.local/trust-pkg-debian-bookworm
5354
debian_bookworm_package_layer := $(bin_dir)/scratch/debian-bookworm-trust-package
5455
oci_package_debian_bookworm_additional_layers += $(debian_bookworm_package_layer)

0 commit comments

Comments
 (0)