Skip to content
This repository has been archived by the owner on Jan 18, 2023. It is now read-only.

Commit

Permalink
Merge pull request #141 from planetf1/release-3.4
Browse files Browse the repository at this point in the history
Release 3.4 docker corrections
  • Loading branch information
planetf1 authored Dec 2, 2021
2 parents e789bd1 + a4a8362 commit f271389
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion .github/workflows/merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
runs-on: ubuntu-latest
name: "Merge"
env:
RELEASE_VERSION: 2.11-SNAPSHOT
RELEASE_VERSION: 3.4
steps:
- uses: actions/checkout@v2
- name: Set up JDK
Expand Down Expand Up @@ -76,6 +76,7 @@ jobs:
build-args: version=${{ env.RELEASE_VERSION }}
context: .
file: ./Dockerfile
platforms: linux/amd64,linux/arm64
# For main code stream
- name: Build and push (main merge)
if: github.ref == 'refs/heads/main'
Expand All @@ -87,6 +88,7 @@ jobs:
build-args: version=${{ env.RELEASE_VERSION }}
context: .
file: ./Dockerfile
platforms: linux/amd64,linux/arm64
- name: Image digest (release)
if: github.ref != 'refs/heads/main'
run: echo ${{ steps.docker_build_release.outputs.digest }}
Expand Down

0 comments on commit f271389

Please sign in to comment.