Skip to content
This repository has been archived by the owner on Jul 3, 2024. It is now read-only.

Commit

Permalink
actually login into docker before publishing
Browse files Browse the repository at this point in the history
  • Loading branch information
nkoester committed Sep 5, 2023
1 parent 49d98a2 commit f5af42d
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 7 deletions.
1 change: 0 additions & 1 deletion .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,5 +42,4 @@ jobs:
env:
DOCKER_HUB_USER: ${{ secrets.DOCKER_HUB_USER }}
DOCKER_HUB_KEY: ${{ secrets.DOCKER_HUB_KEY }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: cd docker && ./docker-build-projector.sh
7 changes: 1 addition & 6 deletions .github/workflows/publishManual.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,7 @@ jobs:

- name: Build and Publish Maven
env:
NEXUS_USERNAME: ${{ secrets.NEXUS_USERNAME }}
NEXUS_PASSWORD: ${{ secrets.NEXUS_PASSWORD }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: ./gradlew assemble publish -Partifacts.itemis.cloud.user=${{secrets.ARTIFACTS_ITEMIS_CLOUD_USER}} -Partifacts.itemis.cloud.pw=${{secrets.ARTIFACTS_ITEMIS_CLOUD_PW}}
run: ./gradlew assemble publish -Partifacts.itemis.cloud.user=${{secrets.ARTIFACTS_ITEMIS_CLOUD_USER}} -Partifacts.itemis.cloud.pw=${{secrets.ARTIFACTS_ITEMIS_CLOUD_PW}} -Pgpr.user=${{ github.actor }} -Pgpr.key=${{ secrets.GHP_UNIVERSAL_PUBLISH_TOKEN }}

- name: Set up QEMU
uses: docker/setup-qemu-action@v2
Expand All @@ -46,6 +43,4 @@ jobs:
env:
DOCKER_HUB_USER: ${{ secrets.DOCKER_HUB_USER }}
DOCKER_HUB_KEY: ${{ secrets.DOCKER_HUB_KEY }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: cd docker && ./docker-build-projector.sh

2 changes: 2 additions & 0 deletions docker/docker-build-projector.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ cp -r ../build/org.modelix/build/artifacts/org.modelix build/artifacts/
MPS_VERSION=$( ./helper/mps-version.sh )
MODELIX_VERSION=$( ./helper/modelix-version.sh )

docker login -u "$DOCKER_HUB_USER" -p "$DOCKER_HUB_KEY"

if [ "${CI}" = "true" ]; then
docker buildx build --platform linux/amd64,linux/arm64 --push --build-arg MPS_VERSION=${MPS_VERSION} -f Dockerfile-projector \
-t "modelix/modelix-projector:${MODELIX_VERSION}" .
Expand Down

0 comments on commit f5af42d

Please sign in to comment.