Skip to content

Commit

Permalink
release-fix: allow manual entry of Docker tag
Browse files Browse the repository at this point in the history
  • Loading branch information
paullatzelsperger committed Apr 19, 2023
1 parent 93b2ad9 commit 52a3ecd
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 3 deletions.
7 changes: 4 additions & 3 deletions .github/actions/publish-docker-image/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,9 @@ inputs:
docker_token:
required: false
description: "DockerHub Token. No push is done if omitted"
docker_tag:
required: false
description: 'additional docker tags'
runs:
using: "composite"
steps:
Expand Down Expand Up @@ -72,9 +75,7 @@ runs:
images: |
${{ inputs.namespace }}/${{ inputs.imagename }}
tags: |
type=ref,event=branch
type=ref,event=pr
type=semver,pattern={{version}}
type=semver,pattern={{version}},value=${{ inputs.docker_tag }}
type=semver,pattern={{major}}
type=semver,pattern={{major}}.{{minor}}
type=semver,pattern={{raw}}
Expand Down
5 changes: 5 additions & 0 deletions .github/workflows/publish-docker.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,9 @@ on:
description: 'The namespace (=repo) in DockerHub'
required: false
default: "tractusx"
docker_tag:
description: 'Explicitly specify the Docker tag. Note that SHA and latest are added automatically.'
required: false

concurrency:
# cancel only running jobs on pull requests
Expand All @@ -53,6 +56,7 @@ jobs:
- uses: actions/checkout@v3.3.0
- uses: ./.github/actions/publish-docker-image
with:
docker_tag: ${{ inputs.docker_tag }}
rootDir: edc-controlplane/${{ matrix.name }}
imagename: ${{ matrix.name }}
namespace: ${{ inputs.namespace }}
Expand All @@ -76,6 +80,7 @@ jobs:
- uses: actions/checkout@v3.3.0
- uses: ./.github/actions/publish-docker-image
with:
docker_tag: ${{ inputs.docker_tag }}
rootDir: edc-dataplane/${{ matrix.name }}
imagename: ${{ matrix.name }}
namespace: ${{ inputs.namespace }}
Expand Down

0 comments on commit 52a3ecd

Please sign in to comment.