diff --git a/.github/workflows/deploy-image.yaml b/.github/workflows/deploy-image.yaml index f4c4c06..5b5310a 100644 --- a/.github/workflows/deploy-image.yaml +++ b/.github/workflows/deploy-image.yaml @@ -49,32 +49,6 @@ jobs: id: current_date run: echo "formatted=$(date -u +%Y.%m.%d)" >> $GITHUB_OUTPUT -# - name: Build base image -# id: docker_build_base -# uses: docker/build-push-action@v6 -# with: -# context: . -# platforms: linux/amd64,linux/arm64 -# file: Dockerfile -# push: true -# tags: | -# ${{ secrets.DOCKERHUB_REPO }}/postgis:base -# ${{ secrets.DOCKERHUB_REPO }}/postgis:base-${{ matrix.imageVersion.imageDistro }}-${{ matrix.imageVersion.imageDistroVersion }}-${{ matrix.imageVersion.imageDistroVariant }} -# build-args: | -# DISTRO=${{ matrix.imageVersion.imageDistro }} -# IMAGE_VERSION=${{ matrix.imageVersion.imageDistroVersion }} -# IMAGE_VARIANT=${{ matrix.imageVersion.imageDistroVariant }} -# GENERATE_ALL_LOCALE=1 -# POSTGRES_MAJOR_VERSION=${{ matrix.postgresMajorVersion }} -# POSTGIS_MAJOR_VERSION=${{ matrix.postgisMajorVersion }} -# POSTGIS_MINOR_VERSION=${{ matrix.postgisMinorRelease }} -# cache-from: | -# type=gha,scope=test -# type=gha,scope=prod -# type=gha,scope=base -# cache-to: type=gha,scope=base -# target: postgis-base - - name: Build prod image id: docker_build_prod uses: docker/build-push-action@v6 @@ -84,8 +58,7 @@ jobs: file: Dockerfile push: true tags: | - ${{ secrets.DOCKERHUB_REPO }}/postgis:${{ matrix.postgresMajorVersion }} - ${{ secrets.DOCKERHUB_REPO }}/postgis:${{ matrix.postgresMajorVersion }}-${{ matrix.postgisMajorVersion }} + ${{ secrets.DOCKERHUB_REPO }}/postgis ${{ secrets.DOCKERHUB_REPO }}/postgis:${{ matrix.postgresMajorVersion }}-${{ matrix.postgisMajorVersion }}.${{ matrix.postgisMinorRelease }} ${{ secrets.DOCKERHUB_REPO }}/postgis:${{ matrix.postgresMajorVersion }}-${{ matrix.postgisMajorVersion }}.${{ matrix.postgisMinorRelease }}--v${{ steps.current_date.outputs.formatted }} build-args: |