Restore DockerHub images and annotations (#16441)

- **Revert "Drop publish of extended images to DockerHub temporarily
(#16355)"**
- **Revert "Drop annotations from DockerHub uv images (#16356)"**
This commit is contained in:
Zanie Blue 2025-10-24 13:16:24 -05:00 committed by GitHub
parent 7df01bcbde
commit 2baee75a94
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 4 additions and 2 deletions

View File

@ -109,6 +109,7 @@ jobs:
password: ${{ secrets.GITHUB_TOKEN }} password: ${{ secrets.GITHUB_TOKEN }}
- uses: depot/setup-action@b0b1ea4f69e92ebf5dea3f8713a1b0c37b2126a5 - uses: depot/setup-action@b0b1ea4f69e92ebf5dea3f8713a1b0c37b2126a5
- name: Check tag consistency - name: Check tag consistency
if: ${{ needs.docker-plan.outputs.push == 'true' }} if: ${{ needs.docker-plan.outputs.push == 'true' }}
run: | run: |
@ -281,6 +282,7 @@ jobs:
with: with:
images: | images: |
${{ env.UV_GHCR_IMAGE }} ${{ env.UV_GHCR_IMAGE }}
${{ env.UV_DOCKERHUB_IMAGE }}
flavor: | flavor: |
latest=false latest=false
tags: | tags: |
@ -311,7 +313,7 @@ jobs:
- name: Add annotations to images - name: Add annotations to images
if: ${{ needs.docker-plan.outputs.push == 'true' }} if: ${{ needs.docker-plan.outputs.push == 'true' }}
env: env:
IMAGES: "${{ env.UV_GHCR_IMAGE }}" IMAGES: "${{ env.UV_GHCR_IMAGE }} ${{ env.UV_DOCKERHUB_IMAGE }}"
DIGEST: ${{ steps.build-and-push.outputs.digest }} DIGEST: ${{ steps.build-and-push.outputs.digest }}
TAGS: ${{ steps.meta.outputs.tags }} TAGS: ${{ steps.meta.outputs.tags }}
ANNOTATIONS: ${{ steps.meta.outputs.annotations }} ANNOTATIONS: ${{ steps.meta.outputs.annotations }}
@ -385,7 +387,7 @@ jobs:
# minimized to just touch the GHCR manifest. # minimized to just touch the GHCR manifest.
- name: Add annotations to images - name: Add annotations to images
env: env:
IMAGES: "${{ env.UV_GHCR_IMAGE }}" IMAGES: "${{ env.UV_GHCR_IMAGE }} ${{ env.UV_DOCKERHUB_IMAGE }}"
DIGEST: ${{ needs.docker-publish-base.outputs.image-digest }} DIGEST: ${{ needs.docker-publish-base.outputs.image-digest }}
TAGS: ${{ needs.docker-publish-base.outputs.image-tags }} TAGS: ${{ needs.docker-publish-base.outputs.image-tags }}
ANNOTATIONS: ${{ needs.docker-publish-base.outputs.image-annotations }} ANNOTATIONS: ${{ needs.docker-publish-base.outputs.image-annotations }}