Skip to content

Commit

Permalink
Merge pull request #21 from infosiftr/bashbrew-arch
Browse files Browse the repository at this point in the history
Add "bashbrew" architecture string as an additional annotation
  • Loading branch information
tianon authored Feb 2, 2024
2 parents c3c2985 + 88803ac commit 465e946
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 0 deletions.
2 changes: 2 additions & 0 deletions .test/example-commands.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,15 @@ 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' \
--annotation 'manifest-descriptor:org.opencontainers.image.revision=6d541d27b5dd12639e5a33a675ebca04d3837d74' \
--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' \
Expand Down
2 changes: 2 additions & 0 deletions meta.jq
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 465e946

Please sign in to comment.