From df47d2f4a61b65ae2c7031b4969f4b1eaf3f90a3 Mon Sep 17 00:00:00 2001 From: Andrei Kvapil Date: Sat, 17 Feb 2024 19:11:09 +0100 Subject: [PATCH] Change tag for matchbox image (#15) Signed-off-by: Andrei Kvapil --- README.md | 2 +- hack/prepare_release.sh | 2 +- packages/core/installer/Makefile | 10 ++++++---- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 8337108f..d7a2991e 100644 --- a/README.md +++ b/README.md @@ -99,7 +99,7 @@ Any Linux system installed on it (eg. Ubuntu should be enough) Start matchbox with prebuilt Talos image for Cozystack: ```bash -sudo docker run --name=matchbox -d --net=host ghcr.io/aenix-io/cozystack/matchbox:v0.0.2 \ +sudo docker run --name=matchbox -d --net=host ghcr.io/aenix-io/cozystack/matchbox:v1.6.4 \ -address=:8080 \ -log-level=debug ``` diff --git a/hack/prepare_release.sh b/hack/prepare_release.sh index 436c4bf2..77338435 100755 --- a/hack/prepare_release.sh +++ b/hack/prepare_release.sh @@ -12,7 +12,7 @@ talos_version=$(awk '/^version:/ {print $2}' packages/core/installer/images/talo set -x -sed -i "s|\(ghcr.io/aenix-io/cozystack/matchbox:\)v[^ ]\+|\1${version}|g" README.md +sed -i "s|\(ghcr.io/aenix-io/cozystack/matchbox:\)v[^ ]\+|\1${talos_version}|g" README.md sed -i "s|\(ghcr.io/aenix-io/cozystack/talos:\)v[^ ]\+|\1${talos_version}|g" README.md sed -i "/^TAG / s|=.*|= ${version}|" \ diff --git a/packages/core/installer/Makefile b/packages/core/installer/Makefile index 5d10583c..ebb1b5f9 100644 --- a/packages/core/installer/Makefile +++ b/packages/core/installer/Makefile @@ -24,12 +24,13 @@ image-installer: docker buildx build -f images/installer/Dockerfile ../../.. \ --provenance false \ --tag $(REGISTRY)/installer:$(TAG) \ - --cache-from type=registry,ref=$(REGISTRY)/installer:$(TAG) \ + --tag $(REGISTRY)/installer:$(TALOS_VERSION)-$(TAG) \ + --cache-from type=registry,ref=$(REGISTRY)/installer:$(TALOS_VERSION) \ --cache-to type=inline \ --metadata-file images/installer.json \ --push=$(PUSH) \ --load=$(LOAD) - echo "$(REGISTRY)/installer:$(TAG)" > images/installer.tag + echo "$(REGISTRY)/installer:$(TALOS_VERSION)" > images/installer.tag image-talos: test -f ../../../_out/assets/installer-amd64.tar || make talos-installer @@ -43,12 +44,13 @@ image-matchbox: docker buildx build -f images/matchbox/Dockerfile ../../.. \ --provenance false \ --tag $(REGISTRY)/matchbox:$(TAG) \ - --cache-from type=registry,ref=$(REGISTRY)/matchbox:$(TAG) \ + --tag $(REGISTRY)/matchbox:$(TALOS_VERSION)-$(TAG) \ + --cache-from type=registry,ref=$(REGISTRY)/matchbox:$(TALOS_VERSION) \ --cache-to type=inline \ --metadata-file images/matchbox.json \ --push=$(PUSH) \ --load=$(LOAD) - echo "$(REGISTRY)/matchbox:$(TAG)" > images/matchbox.tag + echo "$(REGISTRY)/matchbox:$(TALOS_VERSION)" > images/matchbox.tag assets: talos-iso