From 1dd154dd35a9388e4bfcf1f7429629c22f79d03a Mon Sep 17 00:00:00 2001 From: Zoey Date: Fri, 24 Feb 2023 15:33:24 +0100 Subject: [PATCH 1/4] use docker manifest create inside beta push --- .github/workflows/promote-to-beta.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/promote-to-beta.yml b/.github/workflows/promote-to-beta.yml index 07caaa22..906c6e84 100644 --- a/.github/workflows/promote-to-beta.yml +++ b/.github/workflows/promote-to-beta.yml @@ -46,9 +46,11 @@ jobs: docker manifest push nextcloud/$AIO_NAME\:beta # arm64 - docker buildx imagetools create --tag nextcloud/$AIO_NAME\:beta-arm64 nextcloud/$AIO_NAME\:develop-arm64 + docker manifest create nextcloud/$AIO_NAME\:beta-arm64 -a nextcloud/$AIO_NAME\:develop-arm64 + docker manifest push nextcloud/$AIO_NAME\:beta-arm64 else # amd64 - docker buildx imagetools create --tag nextcloud/$AIO_NAME\:beta nextcloud/$AIO_NAME\:develop - fi \ No newline at end of file + docker manifest create nextcloud/$AIO_NAME\:beta -a nextcloud/$AIO_NAME\:develop + docker manifest push nextcloud/$AIO_NAME\:beta + fi From 044a7f722ecb60a2e38e61d822c7a4a0d6120daa Mon Sep 17 00:00:00 2001 From: Zoey Date: Fri, 24 Feb 2023 18:27:15 +0100 Subject: [PATCH 2/4] revert clamav --- .github/workflows/promote-to-beta.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/promote-to-beta.yml b/.github/workflows/promote-to-beta.yml index 906c6e84..3d97b7ef 100644 --- a/.github/workflows/promote-to-beta.yml +++ b/.github/workflows/promote-to-beta.yml @@ -51,6 +51,5 @@ jobs: else # amd64 - docker manifest create nextcloud/$AIO_NAME\:beta -a nextcloud/$AIO_NAME\:develop - docker manifest push nextcloud/$AIO_NAME\:beta + docker buildx imagetools create --tag nextcloud/$AIO_NAME\:beta nextcloud/$AIO_NAME\:develop fi From 9b90947b729917faa771dbe334ba6a3fe5347e84 Mon Sep 17 00:00:00 2001 From: Simon L Date: Fri, 24 Feb 2023 18:35:48 +0100 Subject: [PATCH 3/4] Revert "revert clamav" @Zoey2936 sorr for my fault. This change actually makes totally sense to be consistent. I misread the logic. Sorry for that! This reverts commit 044a7f722ecb60a2e38e61d822c7a4a0d6120daa. Signed-off-by: Simon L --- .github/workflows/promote-to-beta.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/promote-to-beta.yml b/.github/workflows/promote-to-beta.yml index 3d97b7ef..906c6e84 100644 --- a/.github/workflows/promote-to-beta.yml +++ b/.github/workflows/promote-to-beta.yml @@ -51,5 +51,6 @@ jobs: else # amd64 - docker buildx imagetools create --tag nextcloud/$AIO_NAME\:beta nextcloud/$AIO_NAME\:develop + docker manifest create nextcloud/$AIO_NAME\:beta -a nextcloud/$AIO_NAME\:develop + docker manifest push nextcloud/$AIO_NAME\:beta fi From 001c27f3d93bf362bfd8f9a016e7833b05cdf979 Mon Sep 17 00:00:00 2001 From: Zoey Date: Fri, 24 Feb 2023 18:54:30 +0100 Subject: [PATCH 4/4] make arm64 also multiarch --- .github/workflows/promote-to-beta.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/promote-to-beta.yml b/.github/workflows/promote-to-beta.yml index 906c6e84..f3ac71a9 100644 --- a/.github/workflows/promote-to-beta.yml +++ b/.github/workflows/promote-to-beta.yml @@ -46,7 +46,7 @@ jobs: docker manifest push nextcloud/$AIO_NAME\:beta # arm64 - docker manifest create nextcloud/$AIO_NAME\:beta-arm64 -a nextcloud/$AIO_NAME\:develop-arm64 + docker manifest create nextcloud/$AIO_NAME\:beta-arm64 -a nextcloud/$AIO_NAME\:develop -a nextcloud/$AIO_NAME\:develop-arm64 docker manifest push nextcloud/$AIO_NAME\:beta-arm64 else