diff options
author | nicolargo <nicolas@nicolargo.com> | 2022-11-19 16:08:18 +0100 |
---|---|---|
committer | nicolargo <nicolas@nicolargo.com> | 2022-11-19 16:08:18 +0100 |
commit | 70aa46d4a0b6ad8ff6f4aa02eaad1d938ab891e3 (patch) | |
tree | dfdcb8b54cd2247ea7c895049487969b44a1b082 /.github | |
parent | d6818c9c3afeb82c574c7c79dbd23a9a2adbede6 (diff) | |
parent | ea60836cc9bc540202a7d2783d8bd43bd0e06bd2 (diff) |
Solve conflicts
Diffstat (limited to '.github')
-rw-r--r-- | .github/workflows/build.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5c6cc2ed..2d9d1376 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -96,7 +96,7 @@ jobs: strategy: fail-fast: false matrix: - os: ['debian', 'alpine'] + os: ['alpine'] tag: ${{ fromJson(needs.create_Docker_builds.outputs.tags) }} steps: - name: Checkout @@ -139,7 +139,7 @@ jobs: uses: docker/build-push-action@v3 with: push: ${{ env.PUSH_BRANCH == 'true' }} - tags: "${{ env.DEFAULT_DOCKER_IMAGE }}:${{ matrix.os != 'debian' && format('{0}-', matrix.os) || '' }}${{ matrix.tag.tag }}" + tags: "${{ env.DEFAULT_DOCKER_IMAGE }}:${{ matrix.os != 'alpine' && format('{0}-', matrix.os) || '' }}${{ matrix.tag.tag }}" build-args: | CHANGING_ARG=${{ github.sha }} context: . |