Skip to content

Commit

Permalink
reverted os arg value and used repo arg
Browse files Browse the repository at this point in the history
  • Loading branch information
cedric-fauth committed May 31, 2024
1 parent bfff6b7 commit 90edd3b
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
5 changes: 3 additions & 2 deletions desktop/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,14 @@ LABEL maintainer="OPENGIS.ch <[email protected]>"

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 && \
Expand Down
2 changes: 1 addition & 1 deletion scripts/build-push-docker.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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}

0 comments on commit 90edd3b

Please sign in to comment.