Skip to content

Commit eced377

Browse files
authored
Require vars.DOCKER_REPOSITORY to publish image (#7400)
To allow user arikfr to publish images to redash/redash and redash/preview. Only use vars.DOCKER_USER and secrets.DOCKER_PASSWORD for authorization.
1 parent 84262fe commit eced377

File tree

1 file changed

+9
-6
lines changed

1 file changed

+9
-6
lines changed

.github/workflows/preview-image.yml

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,9 @@ jobs:
3232
elif [[ "${{ secrets.DOCKER_PASS }}" == '' ]]; then
3333
echo 'Docker password is empty. Skipping build+push'
3434
echo skip=true >> "$GITHUB_OUTPUT"
35+
elif [[ "${{ vars.DOCKER_REPOSITORY }}" == '' ]]; then
36+
echo 'Docker repository is empty. Skipping build+push'
37+
echo skip=true >> "$GITHUB_OUTPUT"
3538
else
3639
echo 'Docker user and password are set and branch is `master`.'
3740
echo 'Building + pushing `preview` image.'
@@ -169,14 +172,14 @@ jobs:
169172
if: ${{ github.event.inputs.dockerRepository == 'preview' || !github.event.workflow_run }}
170173
working-directory: ${{ runner.temp }}/digests
171174
run: |
172-
docker buildx imagetools create -t ${{ vars.DOCKER_USER }}/redash:preview \
173-
$(printf '${{ vars.DOCKER_USER }}/redash:preview@sha256:%s ' *)
174-
docker buildx imagetools create -t ${{ vars.DOCKER_USER }}/preview:${{ needs.build-docker-image.outputs.VERSION_TAG }} \
175-
$(printf '${{ vars.DOCKER_USER }}/preview:${{ needs.build-docker-image.outputs.VERSION_TAG }}@sha256:%s ' *)
175+
docker buildx imagetools create -t ${{ vars.DOCKER_REPOSITORY }}/redash:preview \
176+
$(printf '${{ vars.DOCKER_REPOSITORY }}/redash:preview@sha256:%s ' *)
177+
docker buildx imagetools create -t ${{ vars.DOCKER_REPOSITORY }}/preview:${{ needs.build-docker-image.outputs.VERSION_TAG }} \
178+
$(printf '${{ vars.DOCKER_REPOSITORY }}/preview:${{ needs.build-docker-image.outputs.VERSION_TAG }}@sha256:%s ' *)
176179
177180
- name: Create and push manifest for the release image
178181
if: ${{ github.event.inputs.dockerRepository == 'redash' }}
179182
working-directory: ${{ runner.temp }}/digests
180183
run: |
181-
docker buildx imagetools create -t ${{ vars.DOCKER_USER }}/redash:${{ needs.build-docker-image.outputs.VERSION_TAG }} \
182-
$(printf '${{ vars.DOCKER_USER }}/redash:${{ needs.build-docker-image.outputs.VERSION_TAG }}@sha256:%s ' *)
184+
docker buildx imagetools create -t ${{ vars.DOCKER_REPOSITORY }}/redash:${{ needs.build-docker-image.outputs.VERSION_TAG }} \
185+
$(printf '${{ vars.DOCKER_REPOSITORY }}/redash:${{ needs.build-docker-image.outputs.VERSION_TAG }}@sha256:%s ' *)

0 commit comments

Comments
 (0)