Skip to content

Commit

Permalink
Unify image builds
Browse files Browse the repository at this point in the history
  • Loading branch information
grahamgilbert committed Nov 7, 2024
1 parent c54d80a commit 15a482a
Show file tree
Hide file tree
Showing 5 changed files with 29 additions and 71 deletions.
15 changes: 14 additions & 1 deletion .github/workflows/build-latest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,22 @@ jobs:
password: ${{secrets.GITHUB_TOKEN}}

- name: Build and Push Docker image
id: push
uses: docker/[email protected]
with:
context: .
push: true
tags: ghcr.io/salopensource/sal:latest

- name: Checkout SAML repository
uses: actions/checkout@v2
with:
repository: salopensource/sal-saml
path: saml

- name: Build and Push Docker image
uses: docker/[email protected]
with:
context: saml
file: saml/Dockerfile
push: true
tags: ghcr.io/salopensource/sal-saml:latest
16 changes: 14 additions & 2 deletions .github/workflows/build-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,22 @@ jobs:
password: ${{secrets.GITHUB_TOKEN}}

- name: Build and Push Docker image
id: push
uses: docker/[email protected]
with:
context: .
push: true
tags: ghcr.io/salopensource/sal:${{ github.ref_name }}


- name: Checkout another repository
uses: actions/checkout@v2
with:
repository: salopensource/sal-saml
path: saml

- name: Build and Push Docker image
uses: docker/[email protected]
with:
context: saml
push: true
file: saml/Dockerfile
tags: ghcr.io/salopensource/sal-saml:${{ github.ref_name }}
34 changes: 0 additions & 34 deletions .github/workflows/build-saml-latest.yml

This file was deleted.

33 changes: 0 additions & 33 deletions .github/workflows/build-saml-release.yml

This file was deleted.

2 changes: 1 addition & 1 deletion sal/version.plist
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
<plist version="1.0">
<dict>
<key>version</key>
<string>4.3.0.2299</string>
<string>4.3.0.2301</string>
</dict>
</plist>

0 comments on commit 15a482a

Please sign in to comment.