From d8dd929aa4f69416bdda19330f70d1f22a93ea0f Mon Sep 17 00:00:00 2001 From: Andrei Kvapil Date: Fri, 9 Feb 2024 15:13:42 +0100 Subject: [PATCH] Preapre release v0.0.2 (#12) Signed-off-by: Andrei Kvapil --- Makefile | 8 +++++++ README.md | 4 ++-- hack/prepare_release.sh | 22 +++++++++++++++++++ manifests/cozystack-installer.yaml | 4 ++-- packages/apps/http-cache/Makefile | 10 +++++---- .../apps/http-cache/images/nginx-cache.json | 8 +++---- .../apps/http-cache/images/nginx-cache.tag | 2 +- packages/apps/http-cache/images/nginx.json | 4 ++++ packages/apps/kubernetes/Makefile | 5 +++-- packages/core/installer/Makefile | 2 +- packages/core/installer/images/installer.json | 8 +++---- packages/core/installer/images/installer.tag | 2 +- .../images/installer/Dockerfile.dockerignore | 0 packages/core/installer/images/matchbox.json | 8 +++---- packages/core/installer/images/matchbox.tag | 2 +- packages/system/dashboard/Makefile | 2 +- .../system/dashboard/images/dashboard.tag | 2 +- .../dashboard/images/kubeapps-apis.json | 4 ++-- .../system/dashboard/images/kubeapps-apis.tag | 2 +- 19 files changed, 68 insertions(+), 31 deletions(-) create mode 100755 hack/prepare_release.sh create mode 100644 packages/apps/http-cache/images/nginx.json rename .dockerignore => packages/core/installer/images/installer/Dockerfile.dockerignore (100%) diff --git a/Makefile b/Makefile index e0d3e4a4..7f9fcd01 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,15 @@ .PHONY: manifests repos assets +build: + make -C packages/apps/http-cache image + make -C packages/apps/kubernetes image + make -C packages/system/dashboard image + make -C packages/core/installer image + make manifests + manifests: (cd packages/core/installer/; helm template -n cozy-installer installer .) > manifests/cozystack-installer.yaml + sed -i 's|@sha256:[^"]\+||' manifests/cozystack-installer.yaml repos: rm -rf _out diff --git a/README.md b/README.md index e645a32c..8337108f 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.1 \ +sudo docker run --name=matchbox -d --net=host ghcr.io/aenix-io/cozystack/matchbox:v0.0.2 \ -address=:8080 \ -log-level=debug ``` @@ -142,7 +142,7 @@ example output: ```console CONTAINER ID IMAGE COMMAND CREATED STATUS PORTS NAMES 22044f26f74d quay.io/poseidon/dnsmasq "/usr/sbin/dnsmasq -…" 6 seconds ago Up 5 seconds dnsmasq -231ad81ff9e0 ghcr.io/aenix-io/cozystack/matchbox:v0.0.1 "/matchbox -address=…" 58 seconds ago Up 57 seconds matchbox +231ad81ff9e0 ghcr.io/aenix-io/cozystack/matchbox:v0.0.2 "/matchbox -address=…" 58 seconds ago Up 57 seconds matchbox ``` ### Bootstrap cluster diff --git a/hack/prepare_release.sh b/hack/prepare_release.sh new file mode 100755 index 00000000..436c4bf2 --- /dev/null +++ b/hack/prepare_release.sh @@ -0,0 +1,22 @@ +#!/bin/sh +set -e + +if [ -e $1 ]; then + echo "Please pass version in the first argument" + echo "Example: $0 v0.0.2" + exit 1 +fi + +version=$1 +talos_version=$(awk '/^version:/ {print $2}' packages/core/installer/images/talos/profiles/installer.yaml) + +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/talos:\)v[^ ]\+|\1${talos_version}|g" README.md + +sed -i "/^TAG / s|=.*|= ${version}|" \ + packages/apps/http-cache/Makefile \ + packages/apps/kubernetes/Makefile \ + packages/core/installer/Makefile \ + packages/system/dashboard/Makefile diff --git a/manifests/cozystack-installer.yaml b/manifests/cozystack-installer.yaml index 8bd53d25..7cc2d335 100644 --- a/manifests/cozystack-installer.yaml +++ b/manifests/cozystack-installer.yaml @@ -72,14 +72,14 @@ spec: serviceAccountName: cozystack containers: - name: cozystack - image: "ghcr.io/aenix-io/cozystack/installer:v0.0.1@sha256:d9edaf7fd53910c979575caf633875af2d16cc8611f79553cee8c18aade067b3" + image: "ghcr.io/aenix-io/cozystack/installer:v0.0.2" env: - name: KUBERNETES_SERVICE_HOST value: localhost - name: KUBERNETES_SERVICE_PORT value: "7445" - name: darkhttpd - image: "ghcr.io/aenix-io/cozystack/installer:v0.0.1@sha256:d9edaf7fd53910c979575caf633875af2d16cc8611f79553cee8c18aade067b3" + image: "ghcr.io/aenix-io/cozystack/installer:v0.0.2" command: - /usr/bin/darkhttpd - /cozystack/assets diff --git a/packages/apps/http-cache/Makefile b/packages/apps/http-cache/Makefile index 59f2d793..e1ab4489 100644 --- a/packages/apps/http-cache/Makefile +++ b/packages/apps/http-cache/Makefile @@ -1,20 +1,22 @@ PUSH := 1 LOAD := 0 REGISTRY := ghcr.io/aenix-io/cozystack -TAG := v0.0.1 +NGINX_CACHE_TAG = v0.1.0 +TAG := v0.0.2 image: image-nginx image-nginx: docker buildx build --platform linux/amd64 --build-arg ARCH=amd64 images/nginx-cache \ --provenance false \ - --tag $(REGISTRY)/nginx-cache:$(TAG) \ - --cache-from type=registry,ref=$(REGISTRY)/nginx-cache:$(TAG) \ + --tag $(REGISTRY)/nginx-cache:$(NGINX_CACHE_TAG) \ + --tag $(REGISTRY)/nginx-cache:$(NGINX_CACHE_TAG)-$(TAG) \ + --cache-from type=registry,ref=$(REGISTRY)/nginx-cache:$(NGINX_CACHE_TAG) \ --cache-to type=inline \ --metadata-file images/nginx-cache.json \ --push=$(PUSH) \ --load=$(LOAD) - echo "$(REGISTRY)/nginx:$(TAG)" > images/nginx-cache.tag + echo "$(REGISTRY)/nginx-cache:$(NGINX_CACHE_TAG)" > images/nginx-cache.tag update: tag=$$(git ls-remote --tags --sort="v:refname" https://github.com/chrislim2888/IP2Location-C-Library | awk -F'[/^]' 'END{print $$3}') && \ diff --git a/packages/apps/http-cache/images/nginx-cache.json b/packages/apps/http-cache/images/nginx-cache.json index ea644a3c..2742b79c 100644 --- a/packages/apps/http-cache/images/nginx-cache.json +++ b/packages/apps/http-cache/images/nginx-cache.json @@ -1,14 +1,14 @@ { - "containerimage.config.digest": "sha256:d68641167af14b246e0332c14a7a9d9f6c0a4f813881db2de5fc53816bd35786", + "containerimage.config.digest": "sha256:f4ad0559a74749de0d11b1835823bf9c95332962b0909450251d849113f22c19", "containerimage.descriptor": { "mediaType": "application/vnd.docker.distribution.manifest.v2+json", - "digest": "sha256:241da53aba9b121d5d1829744a9ba31036cd5e5ffd6cf584da8113ddd79764f2", + "digest": "sha256:3a0e8d791e0ccf681711766387ea9278e7d39f1956509cead2f72aa0001797ef", "size": 1093, "platform": { "architecture": "amd64", "os": "linux" } }, - "containerimage.digest": "sha256:241da53aba9b121d5d1829744a9ba31036cd5e5ffd6cf584da8113ddd79764f2", - "image.name": "ghcr.io/aenix-io/cozystack/nginx-cache:v0.0.1" + "containerimage.digest": "sha256:3a0e8d791e0ccf681711766387ea9278e7d39f1956509cead2f72aa0001797ef", + "image.name": "ghcr.io/aenix-io/cozystack/nginx-cache:v0.1.0,ghcr.io/aenix-io/cozystack/nginx-cache:v0.1.0-v0.0.2" } \ No newline at end of file diff --git a/packages/apps/http-cache/images/nginx-cache.tag b/packages/apps/http-cache/images/nginx-cache.tag index 63b199f0..86b6633b 100644 --- a/packages/apps/http-cache/images/nginx-cache.tag +++ b/packages/apps/http-cache/images/nginx-cache.tag @@ -1 +1 @@ -ghcr.io/aenix-io/cozystack/nginx:v0.0.1 +ghcr.io/aenix-io/cozystack/nginx-cache:v0.1.0 diff --git a/packages/apps/http-cache/images/nginx.json b/packages/apps/http-cache/images/nginx.json new file mode 100644 index 00000000..46348f67 --- /dev/null +++ b/packages/apps/http-cache/images/nginx.json @@ -0,0 +1,4 @@ +{ + "containerimage.config.digest": "sha256:b1916dbacb372ed89ea3f920f08ee68730be2edc016f2caa373a7bbfbad25845", + "containerimage.digest": "sha256:f77d5b63f1ed9dfda4725696d9170130939219a2465260b6ba941947460de2da" +} \ No newline at end of file diff --git a/packages/apps/kubernetes/Makefile b/packages/apps/kubernetes/Makefile index d48cb999..f4de5fdc 100644 --- a/packages/apps/kubernetes/Makefile +++ b/packages/apps/kubernetes/Makefile @@ -1,7 +1,7 @@ PUSH := 1 LOAD := 0 REGISTRY := ghcr.io/aenix-io/cozystack -TAG := v0.0.1 +TAG := v0.0.2 UBUNTU_CONTAINER_DISK_TAG = v1.29.1 image: image-ubuntu-container-disk @@ -9,7 +9,8 @@ image: image-ubuntu-container-disk image-ubuntu-container-disk: docker buildx build --platform linux/amd64 --build-arg ARCH=amd64 images/ubuntu-container-disk \ --provenance false \ - --tag $(REGISTRY)/ubuntu-container-disk:$(TAG)-$(UBUNTU_CONTAINER_DISK_TAG) \ + --tag $(REGISTRY)/ubuntu-container-disk:$(UBUNTU_CONTAINER_DISK_TAG) \ + --tag $(REGISTRY)/ubuntu-container-disk:$(UBUNTU_CONTAINER_DISK_TAG)-$(TAG) \ --cache-from type=registry,ref=$(REGISTRY)/ubuntu-container-disk:$(UBUNTU_CONTAINER_DISK_TAG) \ --cache-to type=inline \ --metadata-file images/ubuntu-container-disk.json \ diff --git a/packages/core/installer/Makefile b/packages/core/installer/Makefile index 14e5f317..5d10583c 100644 --- a/packages/core/installer/Makefile +++ b/packages/core/installer/Makefile @@ -3,7 +3,7 @@ NAME=installer PUSH := 1 LOAD := 0 REGISTRY := ghcr.io/aenix-io/cozystack -TAG := v0.0.1 +TAG := v0.0.2 TALOS_VERSION=$(shell awk '/^version:/ {print $$2}' images/talos/profiles/installer.yaml) show: diff --git a/packages/core/installer/images/installer.json b/packages/core/installer/images/installer.json index f16cd36a..e819fb59 100644 --- a/packages/core/installer/images/installer.json +++ b/packages/core/installer/images/installer.json @@ -1,14 +1,14 @@ { - "containerimage.config.digest": "sha256:507c0236ca2aa8a3e3266070121282bb49000f292521163768c4ad67e52a87e0", + "containerimage.config.digest": "sha256:5c7f51a9cbc945c13d52157035eba6ba4b6f3b68b76280f8e64b4f6ba239db1a", "containerimage.descriptor": { "mediaType": "application/vnd.docker.distribution.manifest.v2+json", - "digest": "sha256:d9edaf7fd53910c979575caf633875af2d16cc8611f79553cee8c18aade067b3", + "digest": "sha256:7cda3480faf0539ed4a3dd252aacc7a997645d3a390ece377c36cf55f9e57e11", "size": 2074, "platform": { "architecture": "amd64", "os": "linux" } }, - "containerimage.digest": "sha256:d9edaf7fd53910c979575caf633875af2d16cc8611f79553cee8c18aade067b3", - "image.name": "ghcr.io/aenix-io/cozystack/installer:v0.0.1" + "containerimage.digest": "sha256:7cda3480faf0539ed4a3dd252aacc7a997645d3a390ece377c36cf55f9e57e11", + "image.name": "ghcr.io/aenix-io/cozystack/installer:v0.0.2" } \ No newline at end of file diff --git a/packages/core/installer/images/installer.tag b/packages/core/installer/images/installer.tag index 8a201869..219384ca 100644 --- a/packages/core/installer/images/installer.tag +++ b/packages/core/installer/images/installer.tag @@ -1 +1 @@ -ghcr.io/aenix-io/cozystack/installer:v0.0.1 +ghcr.io/aenix-io/cozystack/installer:v0.0.2 diff --git a/.dockerignore b/packages/core/installer/images/installer/Dockerfile.dockerignore similarity index 100% rename from .dockerignore rename to packages/core/installer/images/installer/Dockerfile.dockerignore diff --git a/packages/core/installer/images/matchbox.json b/packages/core/installer/images/matchbox.json index f7ab0b80..a03dd1bb 100644 --- a/packages/core/installer/images/matchbox.json +++ b/packages/core/installer/images/matchbox.json @@ -1,14 +1,14 @@ { - "containerimage.config.digest": "sha256:cad05df29f104bbb20796b6a2d2358552ab43fb23fcf77fdf39ec4266f603e66", + "containerimage.config.digest": "sha256:cb8cb211017e51f6eb55604287c45cbf6ed8add5df482aaebff3d493a11b5a76", "containerimage.descriptor": { "mediaType": "application/vnd.docker.distribution.manifest.v2+json", - "digest": "sha256:eb6e15aad1de388e72c04d0573c394aadfbc7fef0dc43abc713bc36d4b486d70", + "digest": "sha256:3be72cdce2f4ab4886a70fb7b66e4518a1fe4ba0771319c96fa19a0d6f409602", "size": 1488, "platform": { "architecture": "amd64", "os": "linux" } }, - "containerimage.digest": "sha256:eb6e15aad1de388e72c04d0573c394aadfbc7fef0dc43abc713bc36d4b486d70", - "image.name": "ghcr.io/aenix-io/cozystack/matchbox:v0.0.1" + "containerimage.digest": "sha256:3be72cdce2f4ab4886a70fb7b66e4518a1fe4ba0771319c96fa19a0d6f409602", + "image.name": "ghcr.io/aenix-io/cozystack/matchbox:v0.0.2" } \ No newline at end of file diff --git a/packages/core/installer/images/matchbox.tag b/packages/core/installer/images/matchbox.tag index 773b53ab..ef369486 100644 --- a/packages/core/installer/images/matchbox.tag +++ b/packages/core/installer/images/matchbox.tag @@ -1 +1 @@ -ghcr.io/aenix-io/cozystack/matchbox:v0.0.1 +ghcr.io/aenix-io/cozystack/matchbox:v0.0.2 diff --git a/packages/system/dashboard/Makefile b/packages/system/dashboard/Makefile index 8e67094d..c2b25093 100644 --- a/packages/system/dashboard/Makefile +++ b/packages/system/dashboard/Makefile @@ -3,7 +3,7 @@ NAMESPACE=cozy-dashboard PUSH := 1 LOAD := 0 REPOSITORY := ghcr.io/aenix-io/cozystack -TAG := v0.0.1 +TAG := v0.0.2 show: helm template --dry-run=server -n $(NAMESPACE) $(NAME) . diff --git a/packages/system/dashboard/images/dashboard.tag b/packages/system/dashboard/images/dashboard.tag index 1b11f26f..b112b276 100644 --- a/packages/system/dashboard/images/dashboard.tag +++ b/packages/system/dashboard/images/dashboard.tag @@ -1 +1 @@ -ghcr.io/aenix-io/cozystack/dashboard:v0.0.1 +ghcr.io/aenix-io/cozystack/dashboard:v0.0.2 diff --git a/packages/system/dashboard/images/kubeapps-apis.json b/packages/system/dashboard/images/kubeapps-apis.json index ffaf0a3a..919ee2d5 100644 --- a/packages/system/dashboard/images/kubeapps-apis.json +++ b/packages/system/dashboard/images/kubeapps-apis.json @@ -1,4 +1,4 @@ { - "containerimage.config.digest": "sha256:87c3ac99ed10ee9cf29ca01ec3a00da11f336a614ea98c48da04cd7349e13454", - "containerimage.digest": "sha256:d286c9be6baba35fc4b5dacd8701999b490a82fef42a1c52d0d65ced8bb07b51" + "containerimage.config.digest": "sha256:e87d3b19a59f31b70ae9e67ab9422bf2acf8fe5c6c8c585883be16db39068023", + "containerimage.digest": "sha256:692cd506a2eadf1cf09e94eee60986a379da7a604c4810f89c8f6c5c405c2c73" } \ No newline at end of file diff --git a/packages/system/dashboard/images/kubeapps-apis.tag b/packages/system/dashboard/images/kubeapps-apis.tag index af6d5e9a..f5bcd30b 100644 --- a/packages/system/dashboard/images/kubeapps-apis.tag +++ b/packages/system/dashboard/images/kubeapps-apis.tag @@ -1 +1 @@ -ghcr.io/aenix-io/cozystack/kubeapps-apis:v0.0.1 +ghcr.io/aenix-io/cozystack/kubeapps-apis:v0.0.2