Skip to content

Commit 6602aaa

Browse files
dpark01dpark01
committed
Remove OCI annotations from inline version tag imagetools create commands
The initial commit missed the `--annotation` flags in the "Create version tags" steps that run inline (not via the reusable action). These also force OCI format.
1 parent 0b9f32c commit 6602aaa

1 file changed

Lines changed: 0 additions & 48 deletions

File tree

‎.github/workflows/docker.yml‎

Lines changed: 0 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -257,20 +257,12 @@ jobs:
257257
258258
# Create version tag
259259
docker buildx imagetools create \
260-
--annotation "index:org.opencontainers.image.source=https://github.com/broadinstitute/viral-ngs" \
261-
--annotation "index:org.opencontainers.image.description=Viral genomics analysis tools - base image" \
262-
--annotation "index:org.opencontainers.image.licenses=MIT" \
263-
--annotation "index:org.opencontainers.image.authors=viral-ngs@broadinstitute.org" \
264260
--tag ${{ env.GHCR_REPO }}:${VERSION}-baseimage \
265261
${{ env.GHCR_REPO }}:${{ needs.get-version.outputs.image-tag-prefix }}-baseimage-amd64 \
266262
${{ env.GHCR_REPO }}:${{ needs.get-version.outputs.image-tag-prefix }}-baseimage-arm64
267263
268264
# Create major.minor tag
269265
docker buildx imagetools create \
270-
--annotation "index:org.opencontainers.image.source=https://github.com/broadinstitute/viral-ngs" \
271-
--annotation "index:org.opencontainers.image.description=Viral genomics analysis tools - base image" \
272-
--annotation "index:org.opencontainers.image.licenses=MIT" \
273-
--annotation "index:org.opencontainers.image.authors=viral-ngs@broadinstitute.org" \
274266
--tag ${{ env.GHCR_REPO }}:${MAJOR_MINOR}-baseimage \
275267
${{ env.GHCR_REPO }}:${{ needs.get-version.outputs.image-tag-prefix }}-baseimage-amd64 \
276268
${{ env.GHCR_REPO }}:${{ needs.get-version.outputs.image-tag-prefix }}-baseimage-arm64
@@ -411,19 +403,11 @@ jobs:
411403
MAJOR_MINOR=$(echo "$VERSION" | sed -E 's/^([0-9]+\.[0-9]+).*/\1/')
412404
413405
docker buildx imagetools create \
414-
--annotation "index:org.opencontainers.image.source=https://github.com/broadinstitute/viral-ngs" \
415-
--annotation "index:org.opencontainers.image.description=Viral genomics analysis tools - core utilities" \
416-
--annotation "index:org.opencontainers.image.licenses=MIT" \
417-
--annotation "index:org.opencontainers.image.authors=viral-ngs@broadinstitute.org" \
418406
--tag ${{ env.GHCR_REPO }}:${VERSION}-core \
419407
${{ env.GHCR_REPO }}:${{ needs.get-version.outputs.image-tag-prefix }}-core-amd64 \
420408
${{ env.GHCR_REPO }}:${{ needs.get-version.outputs.image-tag-prefix }}-core-arm64
421409
422410
docker buildx imagetools create \
423-
--annotation "index:org.opencontainers.image.source=https://github.com/broadinstitute/viral-ngs" \
424-
--annotation "index:org.opencontainers.image.description=Viral genomics analysis tools - core utilities" \
425-
--annotation "index:org.opencontainers.image.licenses=MIT" \
426-
--annotation "index:org.opencontainers.image.authors=viral-ngs@broadinstitute.org" \
427411
--tag ${{ env.GHCR_REPO }}:${MAJOR_MINOR}-core \
428412
${{ env.GHCR_REPO }}:${{ needs.get-version.outputs.image-tag-prefix }}-core-amd64 \
429413
${{ env.GHCR_REPO }}:${{ needs.get-version.outputs.image-tag-prefix }}-core-arm64
@@ -564,19 +548,11 @@ jobs:
564548
MAJOR_MINOR=$(echo "$VERSION" | sed -E 's/^([0-9]+\.[0-9]+).*/\1/')
565549
566550
docker buildx imagetools create \
567-
--annotation "index:org.opencontainers.image.source=https://github.com/broadinstitute/viral-ngs" \
568-
--annotation "index:org.opencontainers.image.description=Viral genomics analysis tools - assembly" \
569-
--annotation "index:org.opencontainers.image.licenses=MIT" \
570-
--annotation "index:org.opencontainers.image.authors=viral-ngs@broadinstitute.org" \
571551
--tag ${{ env.GHCR_REPO }}:${VERSION}-assemble \
572552
${{ env.GHCR_REPO }}:${{ needs.get-version.outputs.image-tag-prefix }}-assemble-amd64 \
573553
${{ env.GHCR_REPO }}:${{ needs.get-version.outputs.image-tag-prefix }}-assemble-arm64
574554
575555
docker buildx imagetools create \
576-
--annotation "index:org.opencontainers.image.source=https://github.com/broadinstitute/viral-ngs" \
577-
--annotation "index:org.opencontainers.image.description=Viral genomics analysis tools - assembly" \
578-
--annotation "index:org.opencontainers.image.licenses=MIT" \
579-
--annotation "index:org.opencontainers.image.authors=viral-ngs@broadinstitute.org" \
580556
--tag ${{ env.GHCR_REPO }}:${MAJOR_MINOR}-assemble \
581557
${{ env.GHCR_REPO }}:${{ needs.get-version.outputs.image-tag-prefix }}-assemble-amd64 \
582558
${{ env.GHCR_REPO }}:${{ needs.get-version.outputs.image-tag-prefix }}-assemble-arm64
@@ -717,19 +693,11 @@ jobs:
717693
MAJOR_MINOR=$(echo "$VERSION" | sed -E 's/^([0-9]+\.[0-9]+).*/\1/')
718694
719695
docker buildx imagetools create \
720-
--annotation "index:org.opencontainers.image.source=https://github.com/broadinstitute/viral-ngs" \
721-
--annotation "index:org.opencontainers.image.description=Viral genomics analysis tools - metagenomic classification" \
722-
--annotation "index:org.opencontainers.image.licenses=MIT" \
723-
--annotation "index:org.opencontainers.image.authors=viral-ngs@broadinstitute.org" \
724696
--tag ${{ env.GHCR_REPO }}:${VERSION}-classify \
725697
${{ env.GHCR_REPO }}:${{ needs.get-version.outputs.image-tag-prefix }}-classify-amd64 \
726698
${{ env.GHCR_REPO }}:${{ needs.get-version.outputs.image-tag-prefix }}-classify-arm64
727699
728700
docker buildx imagetools create \
729-
--annotation "index:org.opencontainers.image.source=https://github.com/broadinstitute/viral-ngs" \
730-
--annotation "index:org.opencontainers.image.description=Viral genomics analysis tools - metagenomic classification" \
731-
--annotation "index:org.opencontainers.image.licenses=MIT" \
732-
--annotation "index:org.opencontainers.image.authors=viral-ngs@broadinstitute.org" \
733701
--tag ${{ env.GHCR_REPO }}:${MAJOR_MINOR}-classify \
734702
${{ env.GHCR_REPO }}:${{ needs.get-version.outputs.image-tag-prefix }}-classify-amd64 \
735703
${{ env.GHCR_REPO }}:${{ needs.get-version.outputs.image-tag-prefix }}-classify-arm64
@@ -870,19 +838,11 @@ jobs:
870838
MAJOR_MINOR=$(echo "$VERSION" | sed -E 's/^([0-9]+\.[0-9]+).*/\1/')
871839
872840
docker buildx imagetools create \
873-
--annotation "index:org.opencontainers.image.source=https://github.com/broadinstitute/viral-ngs" \
874-
--annotation "index:org.opencontainers.image.description=Viral genomics analysis tools - phylogenetics" \
875-
--annotation "index:org.opencontainers.image.licenses=MIT" \
876-
--annotation "index:org.opencontainers.image.authors=viral-ngs@broadinstitute.org" \
877841
--tag ${{ env.GHCR_REPO }}:${VERSION}-phylo \
878842
${{ env.GHCR_REPO }}:${{ needs.get-version.outputs.image-tag-prefix }}-phylo-amd64 \
879843
${{ env.GHCR_REPO }}:${{ needs.get-version.outputs.image-tag-prefix }}-phylo-arm64
880844
881845
docker buildx imagetools create \
882-
--annotation "index:org.opencontainers.image.source=https://github.com/broadinstitute/viral-ngs" \
883-
--annotation "index:org.opencontainers.image.description=Viral genomics analysis tools - phylogenetics" \
884-
--annotation "index:org.opencontainers.image.licenses=MIT" \
885-
--annotation "index:org.opencontainers.image.authors=viral-ngs@broadinstitute.org" \
886846
--tag ${{ env.GHCR_REPO }}:${MAJOR_MINOR}-phylo \
887847
${{ env.GHCR_REPO }}:${{ needs.get-version.outputs.image-tag-prefix }}-phylo-amd64 \
888848
${{ env.GHCR_REPO }}:${{ needs.get-version.outputs.image-tag-prefix }}-phylo-arm64
@@ -1017,19 +977,11 @@ jobs:
1017977
MAJOR_MINOR=$(echo "$VERSION" | sed -E 's/^([0-9]+\.[0-9]+).*/\1/')
1018978
1019979
docker buildx imagetools create \
1020-
--annotation "index:org.opencontainers.image.source=https://github.com/broadinstitute/viral-ngs" \
1021-
--annotation "index:org.opencontainers.image.description=Viral genomics analysis tools - all tools combined" \
1022-
--annotation "index:org.opencontainers.image.licenses=MIT" \
1023-
--annotation "index:org.opencontainers.image.authors=viral-ngs@broadinstitute.org" \
1024980
--tag ${{ env.GHCR_REPO }}:${VERSION} \
1025981
${{ env.GHCR_REPO }}:${{ needs.get-version.outputs.image-tag-prefix }}-mega-amd64 \
1026982
${{ env.GHCR_REPO }}:${{ needs.get-version.outputs.image-tag-prefix }}-mega-arm64
1027983
1028984
docker buildx imagetools create \
1029-
--annotation "index:org.opencontainers.image.source=https://github.com/broadinstitute/viral-ngs" \
1030-
--annotation "index:org.opencontainers.image.description=Viral genomics analysis tools - all tools combined" \
1031-
--annotation "index:org.opencontainers.image.licenses=MIT" \
1032-
--annotation "index:org.opencontainers.image.authors=viral-ngs@broadinstitute.org" \
1033985
--tag ${{ env.GHCR_REPO }}:${MAJOR_MINOR} \
1034986
${{ env.GHCR_REPO }}:${{ needs.get-version.outputs.image-tag-prefix }}-mega-amd64 \
1035987
${{ env.GHCR_REPO }}:${{ needs.get-version.outputs.image-tag-prefix }}-mega-arm64

0 commit comments

Comments
 (0)