Skip to content

Commit

Permalink
fix docker build
Browse files Browse the repository at this point in the history
  • Loading branch information
stoerr committed Dec 5, 2023
1 parent 4ed0206 commit 9b9e9c4
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 1 deletion.
5 changes: 5 additions & 0 deletions .github/settings-istrepo.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,11 @@
<username>${env.GITHUB_ACTOR}</username>
<password>${env.GITHUB_TOKEN}</password>
</server>
<server>
<id>github-www-composum-com</id>
<username>${env.GITHUB_ACTOR}</username>
<password>${env.GITHUB_TOKEN}</password>
</server>
<server>
<id>ossrh</id>
<username>${env.OSSRH_USER}</username>
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/dockerdeploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -77,11 +77,13 @@ jobs:
env:
DOCKERHUB_USER: composum
DOCKERHUB_PASSWD: ${{ secrets.DOCKERHUB_PASSWD }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
GITHUB_ACTOR: ${{ github.actor }}
# We don't do docker pushes as we don't currently (as of 4/22) have an automatic solution for multi architecture builds
# Compare also https://github.com/actions/virtual-environments/issues/2187 (M1 support for github actions)
run: |
cd docker
$MVNCMD -X -P $(git branch --show-current),allplatforms,github-www-composum-com deploy
$MVNCMD -P $(git branch --show-current),allplatforms,github-www-composum-com deploy
- name: Check docker status
run: |
Expand Down

0 comments on commit 9b9e9c4

Please sign in to comment.