From 8d023fc17111051875a9c8e373b610503fc1583c Mon Sep 17 00:00:00 2001
From: Alexander Wellbrock <a.wellbrock@mailbox.org>
Date: Wed, 18 Nov 2020 12:24:49 +0100
Subject: [PATCH] ci: adapt new podman manifest cli API
---
.gitlab-ci.yml | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bcd9208..191f5c8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -10,7 +10,7 @@ build-aarch64:
stage: build
script:
- podman pull "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG-aarch64" || true
- - podman build --layers=false --cache-from "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG-aarch64" --tag "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG-aarch64" .
+ - podman build --layers=false --cache-from "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG-aarch64" --tag "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG-aarch64" --format docker .
- podman push "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG-aarch64"
tags:
- aarch64
@@ -19,7 +19,7 @@ build-amd64:
stage: build
script:
- podman pull "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG-amd64" || true
- - podman build --layers=false --cache-from "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG-amd64" --tag "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG-amd64" .
+ - podman build --layers=false --cache-from "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG-amd64" --tag "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG-amd64" --format docker .
- podman push "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG-amd64"
tags:
- x86_64
@@ -29,8 +29,10 @@ deploy:
script:
- podman pull "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG-aarch64"
- podman pull "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG-amd64"
- - podman manifest create $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG" "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG-aarch64" "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG-amd64"
- - podman manifest push "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG"
+ - podman manifest create $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG"
+ - podman manifest add $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG" "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG-aarch64"
+ - podman manifest add $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG" "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG-amd64"
+ - podman manifest push --format v2s2 "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG"
except:
- master
tags:
@@ -41,9 +43,11 @@ deploy-master:
script:
- podman pull "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG-aarch64"
- podman pull "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG-amd64"
- - podman manifest create "$CI_REGISTRY_IMAGE" "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG-aarch64" "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG-amd64"
- - podman manifest push "$CI_REGISTRY_IMAGE" "docker://$CI_REGISTRY_IMAGE:master"
- - podman manifest push "$CI_REGISTRY_IMAGE" "docker://$CI_REGISTRY_IMAGE"
+ - podman manifest create "$CI_REGISTRY_IMAGE"
+ - podman manifest add "$CI_REGISTRY_IMAGE" "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG-aarch64"
+ - podman manifest add "$CI_REGISTRY_IMAGE""$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG-amd64"
+ - podman manifest push --format v2s2 "$CI_REGISTRY_IMAGE" "docker://$CI_REGISTRY_IMAGE:master"
+ - podman manifest push --format v2s2 "$CI_REGISTRY_IMAGE" "docker://$CI_REGISTRY_IMAGE"
only:
- master
tags:
--
GitLab