fix context

qgis · Apr 23, 2024 · 3b509d5 · 3b509d5
1 parent 345163d
commit 3b509d5
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/.github/workflows/build_docker_images.yml b/.github/workflows/build_docker_images.yml
@@ -44,7 +44,7 @@ jobs:
 
       - id: nightly
         name: building nightly
-        run: docker build -t qgis/${{ env.DOCKER_TAG }}:nightly -f ${{ matrix.qgis_type }}/Dockerfile --build-arg repo=ubuntu-nightly .
+        run: docker build -t qgis/${{ env.DOCKER_TAG }}:nightly --build-arg repo=ubuntu-nightly ${{ matrix.qgis_type }}
 
       - name: test
         if: ${{ matrix.qgis_type == 'server' }}

diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,3 @@
+*.orig
 .idea
 __pycache__
diff --git a/scripts/build-push-docker.sh b/scripts/build-push-docker.sh
@@ -43,5 +43,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 ubuntu_dist=${UBUNTU_DIST} --build-arg repo=${QGIS_UBUNTU_PPA}  ${ALL_TAGS} -f ${QGIS_TYPE}/Dockerfile .
+docker buildx build --push --platform linux/amd64,linux/arm64 --build-arg ubuntu_dist=${UBUNTU_DIST} --build-arg repo=${QGIS_UBUNTU_PPA}  ${ALL_TAGS} ${QGIS_TYPE}