Skip to content

Commit c3c2985

Browse files
yosifkityosifkit
authored
Merge pull request #19 from infosiftr/org.opencontainers.image.base
Set `org.opencontainers.image.base.name` (and `org.opencontainers.image.base.digest`) appropriately
2 parents a80a2c8 + bfaf427 commit c3c2985

File tree

5 files changed

+70
-7
lines changed

5 files changed

+70
-7
lines changed

‎.test/builds.json

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@
9393
"froms": [
9494
"alpine:3.18"
9595
],
96+
"lastStageFrom": "alpine:3.18",
9697
"platformString": "linux/amd64",
9798
"platform": {
9899
"architecture": "amd64",
@@ -190,6 +191,7 @@
190191
"froms": [
191192
"alpine:3.18"
192193
],
194+
"lastStageFrom": "alpine:3.18",
193195
"platformString": "linux/arm/v6",
194196
"platform": {
195197
"architecture": "arm",
@@ -302,6 +304,7 @@
302304
"froms": [
303305
"alpine:3.18"
304306
],
307+
"lastStageFrom": "alpine:3.18",
305308
"platformString": "linux/arm/v7",
306309
"platform": {
307310
"architecture": "arm",
@@ -414,6 +417,7 @@
414417
"froms": [
415418
"alpine:3.18"
416419
],
420+
"lastStageFrom": "alpine:3.18",
417421
"platformString": "linux/arm64/v8",
418422
"platform": {
419423
"architecture": "arm64",
@@ -540,6 +544,7 @@
540544
"froms": [
541545
"docker:24-cli"
542546
],
547+
"lastStageFrom": "docker:24-cli",
543548
"platformString": "linux/amd64",
544549
"platform": {
545550
"architecture": "amd64",
@@ -639,6 +644,7 @@
639644
"froms": [
640645
"docker:24-cli"
641646
],
647+
"lastStageFrom": "docker:24-cli",
642648
"platformString": "linux/arm/v6",
643649
"platform": {
644650
"architecture": "arm",
@@ -767,6 +773,7 @@
767773
"froms": [
768774
"docker:24-cli"
769775
],
776+
"lastStageFrom": "docker:24-cli",
770777
"platformString": "linux/arm/v7",
771778
"platform": {
772779
"architecture": "arm",
@@ -895,6 +902,7 @@
895902
"froms": [
896903
"docker:24-cli"
897904
],
905+
"lastStageFrom": "docker:24-cli",
898906
"platformString": "linux/arm64/v8",
899907
"platform": {
900908
"architecture": "arm64",
@@ -1002,6 +1010,7 @@
10021010
"froms": [
10031011
"mcr.microsoft.com/windows/servercore:ltsc2022"
10041012
],
1013+
"lastStageFrom": "mcr.microsoft.com/windows/servercore:ltsc2022",
10051014
"platformString": "windows/amd64",
10061015
"platform": {
10071016
"architecture": "amd64",
@@ -1108,6 +1117,7 @@
11081117
"froms": [
11091118
"mcr.microsoft.com/windows/servercore:1809"
11101119
],
1120+
"lastStageFrom": "mcr.microsoft.com/windows/servercore:1809",
11111121
"platformString": "windows/amd64",
11121122
"platform": {
11131123
"architecture": "amd64",
@@ -1236,6 +1246,7 @@
12361246
"alpine:3.16",
12371247
"golang:1.19-alpine3.16"
12381248
],
1249+
"lastStageFrom": "alpine:3.16",
12391250
"platformString": "linux/amd64",
12401251
"platform": {
12411252
"architecture": "amd64",
@@ -1357,6 +1368,7 @@
13571368
"alpine:3.16",
13581369
"golang:1.19-alpine3.16"
13591370
],
1371+
"lastStageFrom": "alpine:3.16",
13601372
"platformString": "linux/arm/v6",
13611373
"platform": {
13621374
"architecture": "arm",
@@ -1493,6 +1505,7 @@
14931505
"alpine:3.16",
14941506
"golang:1.19-alpine3.16"
14951507
],
1508+
"lastStageFrom": "alpine:3.16",
14961509
"platformString": "linux/arm64/v8",
14971510
"platform": {
14981511
"architecture": "arm64",
@@ -1626,6 +1639,7 @@
16261639
"alpine:3.16",
16271640
"golang:1.19-alpine3.16"
16281641
],
1642+
"lastStageFrom": "alpine:3.16",
16291643
"platformString": "linux/386",
16301644
"platform": {
16311645
"architecture": "386",
@@ -1758,6 +1772,7 @@
17581772
"alpine:3.16",
17591773
"golang:1.19-alpine3.16"
17601774
],
1775+
"lastStageFrom": "alpine:3.16",
17611776
"platformString": "linux/ppc64le",
17621777
"platform": {
17631778
"architecture": "ppc64le",
@@ -1890,6 +1905,7 @@
18901905
"alpine:3.16",
18911906
"golang:1.19-alpine3.16"
18921907
],
1908+
"lastStageFrom": "alpine:3.16",
18931909
"platformString": "linux/s390x",
18941910
"platform": {
18951911
"architecture": "s390x",
@@ -2022,6 +2038,7 @@
20222038
"alpine:3.16",
20232039
"golang:1.19-alpine3.16"
20242040
],
2041+
"lastStageFrom": "alpine:3.16",
20252042
"platformString": "linux/amd64",
20262043
"platform": {
20272044
"architecture": "amd64",
@@ -2143,6 +2160,7 @@
21432160
"alpine:3.16",
21442161
"golang:1.19-alpine3.16"
21452162
],
2163+
"lastStageFrom": "alpine:3.16",
21462164
"platformString": "linux/arm/v6",
21472165
"platform": {
21482166
"architecture": "arm",
@@ -2279,6 +2297,7 @@
22792297
"alpine:3.16",
22802298
"golang:1.19-alpine3.16"
22812299
],
2300+
"lastStageFrom": "alpine:3.16",
22822301
"platformString": "linux/arm64/v8",
22832302
"platform": {
22842303
"architecture": "arm64",
@@ -2412,6 +2431,7 @@
24122431
"alpine:3.16",
24132432
"golang:1.19-alpine3.16"
24142433
],
2434+
"lastStageFrom": "alpine:3.16",
24152435
"platformString": "linux/386",
24162436
"platform": {
24172437
"architecture": "386",
@@ -2544,6 +2564,7 @@
25442564
"alpine:3.16",
25452565
"golang:1.19-alpine3.16"
25462566
],
2567+
"lastStageFrom": "alpine:3.16",
25472568
"platformString": "linux/ppc64le",
25482569
"platform": {
25492570
"architecture": "ppc64le",
@@ -2676,6 +2697,7 @@
26762697
"alpine:3.16",
26772698
"golang:1.19-alpine3.16"
26782699
],
2700+
"lastStageFrom": "alpine:3.16",
26792701
"platformString": "linux/s390x",
26802702
"platform": {
26812703
"architecture": "s390x",

‎.test/example-commands.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +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 'org.opencontainers.image.base.name=alpine:3.18' \
17+
--annotation 'org.opencontainers.image.base.digest=sha256:d695c3de6fcd8cfe3a6222b0358425d40adfd129a8a47c3416faff1a8aece389' \
1618
--annotation 'manifest-descriptor:org.opencontainers.image.source=https://github.com/docker-library/docker.git#6d541d27b5dd12639e5a33a675ebca04d3837d74:24/cli' \
1719
--annotation 'manifest-descriptor:org.opencontainers.image.revision=6d541d27b5dd12639e5a33a675ebca04d3837d74' \
1820
--annotation 'manifest-descriptor:org.opencontainers.image.created=1970-01-01T00:00:00Z' \
1921
--annotation 'manifest-descriptor:org.opencontainers.image.version=24.0.7-cli' \
2022
--annotation 'manifest-descriptor:org.opencontainers.image.url=https://hub.docker.com/_/docker' \
23+
--annotation 'manifest-descriptor:org.opencontainers.image.base.name=alpine:3.18' \
24+
--annotation 'manifest-descriptor:org.opencontainers.image.base.digest=sha256:d695c3de6fcd8cfe3a6222b0358425d40adfd129a8a47c3416faff1a8aece389' \
2125
--tag 'docker:24.0.7-cli' \
2226
--tag 'docker:24.0-cli' \
2327
--tag 'docker:24-cli' \

‎.test/sources.json

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
"froms": [
3232
"alpine:3.18"
3333
],
34+
"lastStageFrom": "alpine:3.18",
3435
"platformString": "linux/amd64",
3536
"platform": {
3637
"architecture": "amd64",
@@ -55,6 +56,7 @@
5556
"froms": [
5657
"alpine:3.18"
5758
],
59+
"lastStageFrom": "alpine:3.18",
5860
"platformString": "linux/arm/v6",
5961
"platform": {
6062
"architecture": "arm",
@@ -80,6 +82,7 @@
8082
"froms": [
8183
"alpine:3.18"
8284
],
85+
"lastStageFrom": "alpine:3.18",
8386
"platformString": "linux/arm/v7",
8487
"platform": {
8588
"architecture": "arm",
@@ -105,6 +108,7 @@
105108
"froms": [
106109
"alpine:3.18"
107110
],
111+
"lastStageFrom": "alpine:3.18",
108112
"platformString": "linux/arm64/v8",
109113
"platform": {
110114
"architecture": "arm64",
@@ -162,6 +166,7 @@
162166
"froms": [
163167
"docker:24-cli"
164168
],
169+
"lastStageFrom": "docker:24-cli",
165170
"platformString": "linux/amd64",
166171
"platform": {
167172
"architecture": "amd64",
@@ -191,6 +196,7 @@
191196
"froms": [
192197
"docker:24-cli"
193198
],
199+
"lastStageFrom": "docker:24-cli",
194200
"platformString": "linux/arm/v6",
195201
"platform": {
196202
"architecture": "arm",
@@ -221,6 +227,7 @@
221227
"froms": [
222228
"docker:24-cli"
223229
],
230+
"lastStageFrom": "docker:24-cli",
224231
"platformString": "linux/arm/v7",
225232
"platform": {
226233
"architecture": "arm",
@@ -251,6 +258,7 @@
251258
"froms": [
252259
"docker:24-cli"
253260
],
261+
"lastStageFrom": "docker:24-cli",
254262
"platformString": "linux/arm64/v8",
255263
"platform": {
256264
"architecture": "arm64",
@@ -304,6 +312,7 @@
304312
"froms": [
305313
"mcr.microsoft.com/windows/servercore:ltsc2022"
306314
],
315+
"lastStageFrom": "mcr.microsoft.com/windows/servercore:ltsc2022",
307316
"platformString": "windows/amd64",
308317
"platform": {
309318
"architecture": "amd64",
@@ -356,6 +365,7 @@
356365
"froms": [
357366
"mcr.microsoft.com/windows/servercore:1809"
358367
],
368+
"lastStageFrom": "mcr.microsoft.com/windows/servercore:1809",
359369
"platformString": "windows/amd64",
360370
"platform": {
361371
"architecture": "amd64",
@@ -398,6 +408,7 @@
398408
"alpine:3.16",
399409
"golang:1.19-alpine3.16"
400410
],
411+
"lastStageFrom": "alpine:3.16",
401412
"platformString": "linux/amd64",
402413
"platform": {
403414
"architecture": "amd64",
@@ -425,6 +436,7 @@
425436
"alpine:3.16",
426437
"golang:1.19-alpine3.16"
427438
],
439+
"lastStageFrom": "alpine:3.16",
428440
"platformString": "linux/arm/v6",
429441
"platform": {
430442
"architecture": "arm",
@@ -453,6 +465,7 @@
453465
"alpine:3.16",
454466
"golang:1.19-alpine3.16"
455467
],
468+
"lastStageFrom": "alpine:3.16",
456469
"platformString": "linux/arm64/v8",
457470
"platform": {
458471
"architecture": "arm64",
@@ -481,6 +494,7 @@
481494
"alpine:3.16",
482495
"golang:1.19-alpine3.16"
483496
],
497+
"lastStageFrom": "alpine:3.16",
484498
"platformString": "linux/386",
485499
"platform": {
486500
"architecture": "386",
@@ -508,6 +522,7 @@
508522
"alpine:3.16",
509523
"golang:1.19-alpine3.16"
510524
],
525+
"lastStageFrom": "alpine:3.16",
511526
"platformString": "linux/ppc64le",
512527
"platform": {
513528
"architecture": "ppc64le",
@@ -535,6 +550,7 @@
535550
"alpine:3.16",
536551
"golang:1.19-alpine3.16"
537552
],
553+
"lastStageFrom": "alpine:3.16",
538554
"platformString": "linux/s390x",
539555
"platform": {
540556
"architecture": "s390x",
@@ -581,6 +597,7 @@
581597
"alpine:3.16",
582598
"golang:1.19-alpine3.16"
583599
],
600+
"lastStageFrom": "alpine:3.16",
584601
"platformString": "linux/amd64",
585602
"platform": {
586603
"architecture": "amd64",
@@ -608,6 +625,7 @@
608625
"alpine:3.16",
609626
"golang:1.19-alpine3.16"
610627
],
628+
"lastStageFrom": "alpine:3.16",
611629
"platformString": "linux/arm/v6",
612630
"platform": {
613631
"architecture": "arm",
@@ -636,6 +654,7 @@
636654
"alpine:3.16",
637655
"golang:1.19-alpine3.16"
638656
],
657+
"lastStageFrom": "alpine:3.16",
639658
"platformString": "linux/arm64/v8",
640659
"platform": {
641660
"architecture": "arm64",
@@ -664,6 +683,7 @@
664683
"alpine:3.16",
665684
"golang:1.19-alpine3.16"
666685
],
686+
"lastStageFrom": "alpine:3.16",
667687
"platformString": "linux/386",
668688
"platform": {
669689
"architecture": "386",
@@ -691,6 +711,7 @@
691711
"alpine:3.16",
692712
"golang:1.19-alpine3.16"
693713
],
714+
"lastStageFrom": "alpine:3.16",
694715
"platformString": "linux/ppc64le",
695716
"platform": {
696717
"architecture": "ppc64le",
@@ -718,6 +739,7 @@
718739
"alpine:3.16",
719740
"golang:1.19-alpine3.16"
720741
],
742+
"lastStageFrom": "alpine:3.16",
721743
"platformString": "linux/s390x",
722744
"platform": {
723745
"architecture": "s390x",

0 commit comments

Comments
 (0)