From 88803ac43ecec51a946fd01ff651e13266bcde58 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Fri, 2 Feb 2024 14:41:06 -0800 Subject: [PATCH] Add "bashbrew" architecture string as an additional annotation --- .test/example-commands.sh | 2 ++ meta.jq | 2 ++ 2 files changed, 4 insertions(+) diff --git a/.test/example-commands.sh b/.test/example-commands.sh index ce9de70..a74c599 100644 --- a/.test/example-commands.sh +++ b/.test/example-commands.sh @@ -13,6 +13,7 @@ SOURCE_DATE_EPOCH=1700741054 \ --annotation 'org.opencontainers.image.created=2023-11-23T12:04:14Z' \ --annotation 'org.opencontainers.image.version=24.0.7-cli' \ --annotation 'org.opencontainers.image.url=https://hub.docker.com/_/docker' \ + --annotation 'com.docker.official-images.bashbrew.arch=amd64' \ --annotation 'org.opencontainers.image.base.name=alpine:3.18' \ --annotation 'org.opencontainers.image.base.digest=sha256:d695c3de6fcd8cfe3a6222b0358425d40adfd129a8a47c3416faff1a8aece389' \ --annotation 'manifest-descriptor:org.opencontainers.image.source=https://github.com/docker-library/docker.git#6d541d27b5dd12639e5a33a675ebca04d3837d74:24/cli' \ @@ -20,6 +21,7 @@ SOURCE_DATE_EPOCH=1700741054 \ --annotation 'manifest-descriptor:org.opencontainers.image.created=1970-01-01T00:00:00Z' \ --annotation 'manifest-descriptor:org.opencontainers.image.version=24.0.7-cli' \ --annotation 'manifest-descriptor:org.opencontainers.image.url=https://hub.docker.com/_/docker' \ + --annotation 'manifest-descriptor:com.docker.official-images.bashbrew.arch=amd64' \ --annotation 'manifest-descriptor:org.opencontainers.image.base.name=alpine:3.18' \ --annotation 'manifest-descriptor:org.opencontainers.image.base.digest=sha256:d695c3de6fcd8cfe3a6222b0358425d40adfd129a8a47c3416faff1a8aece389' \ --tag 'docker:24.0.7-cli' \ diff --git a/meta.jq b/meta.jq index 71b1bb9..36f4c61 100644 --- a/meta.jq +++ b/meta.jq @@ -104,6 +104,8 @@ def build_annotations($buildUrl): ), # TODO org.opencontainers.image.vendor ? (feels leaky to put "Docker Official Images" here when this is all otherwise mostly generic) + + "com.docker.official-images.bashbrew.arch": .build.arch, } + ( .source.arches[.build.arch].lastStageFrom as $lastStageFrom