Skip to content

Commit 465e946

Browse files
authored
Merge pull request #21 from infosiftr/bashbrew-arch
Add "bashbrew" architecture string as an additional annotation
2 parents c3c2985 + 88803ac commit 465e946

File tree

2 files changed

+4
-0
lines changed

2 files changed

+4
-0
lines changed

.test/example-commands.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,15 @@ SOURCE_DATE_EPOCH=1700741054 \
1313
--annotation 'org.opencontainers.image.created=2023-11-23T12:04:14Z' \
1414
--annotation 'org.opencontainers.image.version=24.0.7-cli' \
1515
--annotation 'org.opencontainers.image.url=https://hub.docker.com/_/docker' \
16+
--annotation 'com.docker.official-images.bashbrew.arch=amd64' \
1617
--annotation 'org.opencontainers.image.base.name=alpine:3.18' \
1718
--annotation 'org.opencontainers.image.base.digest=sha256:d695c3de6fcd8cfe3a6222b0358425d40adfd129a8a47c3416faff1a8aece389' \
1819
--annotation 'manifest-descriptor:org.opencontainers.image.source=https://github.com/docker-library/docker.git#6d541d27b5dd12639e5a33a675ebca04d3837d74:24/cli' \
1920
--annotation 'manifest-descriptor:org.opencontainers.image.revision=6d541d27b5dd12639e5a33a675ebca04d3837d74' \
2021
--annotation 'manifest-descriptor:org.opencontainers.image.created=1970-01-01T00:00:00Z' \
2122
--annotation 'manifest-descriptor:org.opencontainers.image.version=24.0.7-cli' \
2223
--annotation 'manifest-descriptor:org.opencontainers.image.url=https://hub.docker.com/_/docker' \
24+
--annotation 'manifest-descriptor:com.docker.official-images.bashbrew.arch=amd64' \
2325
--annotation 'manifest-descriptor:org.opencontainers.image.base.name=alpine:3.18' \
2426
--annotation 'manifest-descriptor:org.opencontainers.image.base.digest=sha256:d695c3de6fcd8cfe3a6222b0358425d40adfd129a8a47c3416faff1a8aece389' \
2527
--tag 'docker:24.0.7-cli' \

meta.jq

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,8 @@ def build_annotations($buildUrl):
104104
),
105105

106106
# TODO org.opencontainers.image.vendor ? (feels leaky to put "Docker Official Images" here when this is all otherwise mostly generic)
107+
108+
"com.docker.official-images.bashbrew.arch": .build.arch,
107109
}
108110
+ (
109111
.source.arches[.build.arch].lastStageFrom as $lastStageFrom

0 commit comments

Comments
 (0)