From 0e8c006754f44d99bc9b0b4a596d955e0dfc264f Mon Sep 17 00:00:00 2001 From: Cedric Fauth <105929519+cedric-fauth@users.noreply.github.com> Date: Fri, 31 May 2024 10:08:38 +0200 Subject: [PATCH] reverted os arg value and used repo arg (#111) --- desktop/Dockerfile | 5 +++-- scripts/build-push-docker.sh | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/desktop/Dockerfile b/desktop/Dockerfile index c120246..43210aa 100644 --- a/desktop/Dockerfile +++ b/desktop/Dockerfile @@ -6,13 +6,14 @@ LABEL maintainer="OPENGIS.ch " ARG os ARG release +ARG repo RUN apt update && apt install -y gnupg wget software-properties-common && \ wget -qO - https://qgis.org/downloads/qgis-2022.gpg.key | gpg --no-default-keyring --keyring gnupg-ring:/etc/apt/trusted.gpg.d/qgis-archive.gpg --import && \ chmod a+r /etc/apt/trusted.gpg.d/qgis-archive.gpg && \ # run twice because of https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1041012 - add-apt-repository "deb https://qgis.org/${os} ${release} main" && \ - add-apt-repository "deb https://qgis.org/${os} ${release} main" && \ + add-apt-repository "deb https://qgis.org/${repo} ${release} main" && \ + add-apt-repository "deb https://qgis.org/${repo} ${release} main" && \ apt update && \ DEBIAN_FRONTEND=noninteractive apt-get install -y python3-pip qgis python3-qgis python3-qgis-common python3-venv \ python3-pytest python3-mock xvfb qttools5-dev-tools && \ diff --git a/scripts/build-push-docker.sh b/scripts/build-push-docker.sh index 5b320b3..216b970 100755 --- a/scripts/build-push-docker.sh +++ b/scripts/build-push-docker.sh @@ -45,5 +45,5 @@ for TAG in ${TAGS}; do ALL_TAGS="${ALL_TAGS} --tag qgis/${REPO}:${TAG}" done -docker buildx build --push --platform linux/amd64,linux/arm64 --build-arg os=${QGIS_PPA} --build-arg release=${OS_RELEASE} --build-arg repo=${QGIS_PPA} ${ALL_TAGS} ${QGIS_TYPE} +docker buildx build --push --platform linux/amd64,linux/arm64 --build-arg os=${OS} --build-arg release=${OS_RELEASE} --build-arg repo=${QGIS_PPA} ${ALL_TAGS} ${QGIS_TYPE}