From 3742ab8f6b52d57685e9febc9ba792e02702f10c Mon Sep 17 00:00:00 2001 From: Sunil Mohan Adapa Date: Fri, 11 Oct 2024 08:12:34 -0700 Subject: [PATCH] ci: Generalize script to update container, switch to podman Signed-off-by: Sunil Mohan Adapa Reviewed-by: Veiko Aasa --- .ci/update-container-image.sh | 11 +++++++++++ .ci/update-gitlabci-docker-image.sh | 8 -------- 2 files changed, 11 insertions(+), 8 deletions(-) create mode 100755 .ci/update-container-image.sh delete mode 100755 .ci/update-gitlabci-docker-image.sh diff --git a/.ci/update-container-image.sh b/.ci/update-container-image.sh new file mode 100755 index 000000000..edcb44c69 --- /dev/null +++ b/.ci/update-container-image.sh @@ -0,0 +1,11 @@ +#! /bin/bash +# SPDX-License-Identifier: AGPL-3.0-or-later + +CONTAINER=$1 +CONTAINER="${CONTAINER:-gitlabci}" + +podman login registry.salsa.debian.org + +# Build and upload a new image to the container registry +podman build -t registry.salsa.debian.org/freedombox-team/freedombox:${CONTAINER} -f .ci/Dockerfile.${CONTAINER} . +podman push registry.salsa.debian.org/freedombox-team/freedombox:${CONTAINER} diff --git a/.ci/update-gitlabci-docker-image.sh b/.ci/update-gitlabci-docker-image.sh deleted file mode 100755 index 9ada7724d..000000000 --- a/.ci/update-gitlabci-docker-image.sh +++ /dev/null @@ -1,8 +0,0 @@ -#! /bin/bash -# SPDX-License-Identifier: AGPL-3.0-or-later - -docker login registry.salsa.debian.org - -# Build and upload a new image to the container registry -DOCKER_BUILDKIT=1 docker build -t registry.salsa.debian.org/freedombox-team/freedombox:gitlabci -f .ci/Dockerfile.gitlabci . -docker push registry.salsa.debian.org/freedombox-team/freedombox:gitlabci