check if DOCKER_USERNAME is empty in more places again

Signed-off-by: June Clementine Strawberry <strawberry@puppygock.gay>
This commit is contained in:
June Clementine Strawberry 2025-01-27 12:25:07 -05:00
parent bf5f334635
commit dabb6269b6

View file

@ -776,6 +776,7 @@ jobs:
BRANCH_TAG: ${{ (startsWith(github.ref, 'refs/tags/v') && !endsWith(github.ref, '-rc') && 'latest') || (github.head_ref != '' && format('merge-{0}-{1}', github.event.number, github.event.pull_request.user.login)) || github.ref_name }} BRANCH_TAG: ${{ (startsWith(github.ref, 'refs/tags/v') && !endsWith(github.ref, '-rc') && 'latest') || (github.head_ref != '' && format('merge-{0}-{1}', github.event.number, github.event.pull_request.user.login)) || github.ref_name }}
DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }} DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
DOCKERHUB_USERNAME: ${{ vars.DOCKER_USERNAME }}
GITLAB_TOKEN: ${{ secrets.GITLAB_TOKEN }} GITLAB_TOKEN: ${{ secrets.GITLAB_TOKEN }}
GHCR_ENABLED: "${{ (github.event_name != 'pull_request' || github.event.pull_request.head.repo.fork == false) && 'true' || 'false' }}" GHCR_ENABLED: "${{ (github.event_name != 'pull_request' || github.event.pull_request.head.repo.fork == false) && 'true' || 'false' }}"
steps: steps:
@ -816,7 +817,7 @@ jobs:
- name: Load and push amd64 haswell image - name: Load and push amd64 haswell image
run: | run: |
docker load -i oci-image-amd64-haswell-optimised.tar.gz docker load -i oci-image-amd64-haswell-optimised.tar.gz
if [ ! -z $DOCKERHUB_TOKEN ]; then if [ ! -z $DOCKERHUB_TOKEN ] && [ ! -z $DOCKERHUB_USERNAME ]; then
docker tag $(docker images -q conduwuit:main) ${DOCKER_HUB_REPO}:${UNIQUE_TAG}-haswell docker tag $(docker images -q conduwuit:main) ${DOCKER_HUB_REPO}:${UNIQUE_TAG}-haswell
docker push ${DOCKER_HUB_REPO}:${UNIQUE_TAG}-haswell docker push ${DOCKER_HUB_REPO}:${UNIQUE_TAG}-haswell
fi fi
@ -832,7 +833,7 @@ jobs:
- name: Load and push amd64 image - name: Load and push amd64 image
run: | run: |
docker load -i oci-image-amd64.tar.gz docker load -i oci-image-amd64.tar.gz
if [ ! -z $DOCKERHUB_TOKEN ]; then if [ ! -z $DOCKERHUB_TOKEN ] && [ ! -z $DOCKERHUB_USERNAME ]; then
docker tag $(docker images -q conduwuit:main) ${DOCKER_HUB_REPO}:${UNIQUE_TAG}-amd64 docker tag $(docker images -q conduwuit:main) ${DOCKER_HUB_REPO}:${UNIQUE_TAG}-amd64
docker push ${DOCKER_HUB_REPO}:${UNIQUE_TAG}-amd64 docker push ${DOCKER_HUB_REPO}:${UNIQUE_TAG}-amd64
fi fi
@ -848,7 +849,7 @@ jobs:
- name: Load and push arm64 image - name: Load and push arm64 image
run: | run: |
docker load -i oci-image-arm64v8.tar.gz docker load -i oci-image-arm64v8.tar.gz
if [ ! -z $DOCKERHUB_TOKEN ]; then if [ ! -z $DOCKERHUB_TOKEN ] && [ ! -z $DOCKERHUB_USERNAME ]; then
docker tag $(docker images -q conduwuit:main) ${DOCKER_HUB_REPO}:${UNIQUE_TAG}-arm64v8 docker tag $(docker images -q conduwuit:main) ${DOCKER_HUB_REPO}:${UNIQUE_TAG}-arm64v8
docker push ${DOCKER_HUB_REPO}:${UNIQUE_TAG}-arm64v8 docker push ${DOCKER_HUB_REPO}:${UNIQUE_TAG}-arm64v8
fi fi
@ -864,7 +865,7 @@ jobs:
- name: Load and push amd64 debug image - name: Load and push amd64 debug image
run: | run: |
docker load -i oci-image-amd64-debug.tar.gz docker load -i oci-image-amd64-debug.tar.gz
if [ ! -z $DOCKERHUB_TOKEN ]; then if [ ! -z $DOCKERHUB_TOKEN ] && [ ! -z $DOCKERHUB_USERNAME ]; then
docker tag $(docker images -q conduwuit:main) ${DOCKER_HUB_REPO}:${UNIQUE_TAG}-amd64-debug docker tag $(docker images -q conduwuit:main) ${DOCKER_HUB_REPO}:${UNIQUE_TAG}-amd64-debug
docker push ${DOCKER_HUB_REPO}:${UNIQUE_TAG}-amd64-debug docker push ${DOCKER_HUB_REPO}:${UNIQUE_TAG}-amd64-debug
fi fi
@ -880,7 +881,7 @@ jobs:
- name: Load and push arm64 debug image - name: Load and push arm64 debug image
run: | run: |
docker load -i oci-image-arm64v8-debug.tar.gz docker load -i oci-image-arm64v8-debug.tar.gz
if [ ! -z $DOCKERHUB_TOKEN ]; then if [ ! -z $DOCKERHUB_TOKEN ] && [ ! -z $DOCKERHUB_USERNAME ]; then
docker tag $(docker images -q conduwuit:main) ${DOCKER_HUB_REPO}:${UNIQUE_TAG}-arm64v8-debug docker tag $(docker images -q conduwuit:main) ${DOCKER_HUB_REPO}:${UNIQUE_TAG}-arm64v8-debug
docker push ${DOCKER_HUB_REPO}:${UNIQUE_TAG}-arm64v8-debug docker push ${DOCKER_HUB_REPO}:${UNIQUE_TAG}-arm64v8-debug
fi fi
@ -896,7 +897,7 @@ jobs:
- name: Create Docker haswell manifests - name: Create Docker haswell manifests
run: | run: |
# Dockerhub Container Registry # Dockerhub Container Registry
if [ ! -z $DOCKERHUB_TOKEN ]; then if [ ! -z $DOCKERHUB_TOKEN ] && [ ! -z $DOCKERHUB_USERNAME ]; then
docker manifest create ${DOCKER_HUB_REPO}:${UNIQUE_TAG}-haswell --amend ${DOCKER_HUB_REPO}:${UNIQUE_TAG}-haswell docker manifest create ${DOCKER_HUB_REPO}:${UNIQUE_TAG}-haswell --amend ${DOCKER_HUB_REPO}:${UNIQUE_TAG}-haswell
docker manifest create ${DOCKER_HUB_REPO}:${BRANCH_TAG}-haswell --amend ${DOCKER_HUB_REPO}:${UNIQUE_TAG}-haswell docker manifest create ${DOCKER_HUB_REPO}:${BRANCH_TAG}-haswell --amend ${DOCKER_HUB_REPO}:${UNIQUE_TAG}-haswell
fi fi
@ -914,7 +915,7 @@ jobs:
- name: Create Docker combined manifests - name: Create Docker combined manifests
run: | run: |
# Dockerhub Container Registry # Dockerhub Container Registry
if [ ! -z $DOCKERHUB_TOKEN ]; then if [ ! -z $DOCKERHUB_TOKEN ] && [ ! -z $DOCKERHUB_USERNAME ]; then
docker manifest create ${DOCKER_HUB_REPO}:${UNIQUE_TAG} --amend ${DOCKER_HUB_REPO}:${UNIQUE_TAG}-arm64v8 --amend ${DOCKER_HUB_REPO}:${UNIQUE_TAG}-amd64 docker manifest create ${DOCKER_HUB_REPO}:${UNIQUE_TAG} --amend ${DOCKER_HUB_REPO}:${UNIQUE_TAG}-arm64v8 --amend ${DOCKER_HUB_REPO}:${UNIQUE_TAG}-amd64
docker manifest create ${DOCKER_HUB_REPO}:${BRANCH_TAG} --amend ${DOCKER_HUB_REPO}:${UNIQUE_TAG}-arm64v8 --amend ${DOCKER_HUB_REPO}:${UNIQUE_TAG}-amd64 docker manifest create ${DOCKER_HUB_REPO}:${BRANCH_TAG} --amend ${DOCKER_HUB_REPO}:${UNIQUE_TAG}-arm64v8 --amend ${DOCKER_HUB_REPO}:${UNIQUE_TAG}-amd64
fi fi
@ -932,7 +933,7 @@ jobs:
- name: Create Docker combined debug manifests - name: Create Docker combined debug manifests
run: | run: |
# Dockerhub Container Registry # Dockerhub Container Registry
if [ ! -z $DOCKERHUB_TOKEN ]; then if [ ! -z $DOCKERHUB_TOKEN ] && [ ! -z $DOCKERHUB_USERNAME ]; then
docker manifest create ${DOCKER_HUB_REPO}:${UNIQUE_TAG}-debug --amend ${DOCKER_HUB_REPO}:${UNIQUE_TAG}-arm64v8-debug --amend ${DOCKER_HUB_REPO}:${UNIQUE_TAG}-amd64-debug docker manifest create ${DOCKER_HUB_REPO}:${UNIQUE_TAG}-debug --amend ${DOCKER_HUB_REPO}:${UNIQUE_TAG}-arm64v8-debug --amend ${DOCKER_HUB_REPO}:${UNIQUE_TAG}-amd64-debug
docker manifest create ${DOCKER_HUB_REPO}:${BRANCH_TAG}-debug --amend ${DOCKER_HUB_REPO}:${UNIQUE_TAG}-arm64v8-debug --amend ${DOCKER_HUB_REPO}:${UNIQUE_TAG}-amd64-debug docker manifest create ${DOCKER_HUB_REPO}:${BRANCH_TAG}-debug --amend ${DOCKER_HUB_REPO}:${UNIQUE_TAG}-arm64v8-debug --amend ${DOCKER_HUB_REPO}:${UNIQUE_TAG}-amd64-debug
fi fi
@ -949,7 +950,7 @@ jobs:
- name: Push manifests to Docker registries - name: Push manifests to Docker registries
run: | run: |
if [ ! -z $DOCKERHUB_TOKEN ]; then if [ ! -z $DOCKERHUB_TOKEN ] && [ ! -z $DOCKERHUB_USERNAME ]; then
docker manifest push ${DOCKER_HUB_REPO}:${UNIQUE_TAG} docker manifest push ${DOCKER_HUB_REPO}:${UNIQUE_TAG}
docker manifest push ${DOCKER_HUB_REPO}:${BRANCH_TAG} docker manifest push ${DOCKER_HUB_REPO}:${BRANCH_TAG}
docker manifest push ${DOCKER_HUB_REPO}:${UNIQUE_TAG}-debug docker manifest push ${DOCKER_HUB_REPO}:${UNIQUE_TAG}-debug
@ -976,7 +977,7 @@ jobs:
- name: Add Image Links to Job Summary - name: Add Image Links to Job Summary
run: | run: |
if [ ! -z $DOCKERHUB_TOKEN ]; then if [ ! -z $DOCKERHUB_TOKEN ] && [ ! -z $DOCKERHUB_USERNAME ]; then
echo "- \`docker pull ${DOCKER_HUB_REPO}:${UNIQUE_TAG}\`" >> $GITHUB_STEP_SUMMARY echo "- \`docker pull ${DOCKER_HUB_REPO}:${UNIQUE_TAG}\`" >> $GITHUB_STEP_SUMMARY
echo "- \`docker pull ${DOCKER_HUB_REPO}:${UNIQUE_TAG}-debug\`" >> $GITHUB_STEP_SUMMARY echo "- \`docker pull ${DOCKER_HUB_REPO}:${UNIQUE_TAG}-debug\`" >> $GITHUB_STEP_SUMMARY
echo "- \`docker pull ${DOCKER_HUB_REPO}:${UNIQUE_TAG}-haswell\`" >> $GITHUB_STEP_SUMMARY echo "- \`docker pull ${DOCKER_HUB_REPO}:${UNIQUE_TAG}-haswell\`" >> $GITHUB_STEP_SUMMARY