diff --git a/.github/actions/bump-version/action.yaml b/.github/actions/bump-version/action.yaml index 12d5f3dc..742c98d9 100644 --- a/.github/actions/bump-version/action.yaml +++ b/.github/actions/bump-version/action.yaml @@ -1,14 +1,6 @@ name: Bump Version description: "This action bumps package version and commits to master" -inputs: - GH_APP_ID: - description: GitHub app (bot) id to retrieve the token the installation token. - required: true - GH_APP_KEY_BASE64: - description: GitHub app (bot) private key in base64 to retrieve the installation token. - required: true - outputs: version: description: "The version after the bump" diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 361c8a68..e3359854 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -81,18 +81,19 @@ jobs: with: context: ${{ github.workspace }} push: false - tags: ${{ env.DOCKER_REPO }}:${{ github.run_id }} + tags: docker.eu1.hsdp.io/reporting:${{ github.run_id }} - name: Bump Version id: bump-version uses: ./.github/actions/bump-version - with: - GH_APP_ID: ${{ secrets.REP_GITHUB_APP_ID }} - GH_APP_KEY_BASE64: ${{ secrets.REP_GITHUB_APP_KEY_BASE64 }} + + - name: Docker login + run: | + docker login --username '${{ secrets.DOCKER_USER }}' --password '${{ secrets.DOCKER_PSWD }}' '${{ secrets.DOCKER_REPO }}' - name: Publish Docker image uses: docker/build-push-action@v4 with: context: ${{ github.workspace }} push: true - tags: ${{ env.DOCKER_REPO }}:${{ steps.bump-version.outputs.version }} + tags: docker.eu1.hsdp.io/reporting:${{ steps.bump-version.outputs.version }}