Skip to content

Commit 84d757c

Browse files
committed
Support nested variants
1 parent 93975fb commit 84d757c

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

dockerlib/dockerlib/manifest.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -140,16 +140,17 @@ func (m *ImageManifest) Write(w io.Writer, header *Header) error {
140140
if err != nil {
141141
return err
142142
}
143+
name := strings.Replace(variant.Name, "/", "-", -1)
143144
for i := 2; i <= len(version.Segments()); i++ {
144145
segments := version.Segments()
145146
parts := make([]string, i)
146147
for j, s := range segments[:i] {
147148
parts[j] = strconv.Itoa(s)
148149
}
149-
header.Add("Tags", strings.Join(parts, ".")+"-"+variant.Name)
150+
header.Add("Tags", strings.Join(parts, ".")+"-"+name)
150151
}
151152
if variant.Latest == v.String() {
152-
header.Add("Tags", variant.Name)
153+
header.Add("Tags", name)
153154
}
154155
for _, arch := range variant.Architectures {
155156
header.Add("Architectures", arch)

influxdb/manifest.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@
1515
"versions": ["1.3"]
1616
},
1717
{
18-
"name": "data-alpine",
18+
"name": "data/alpine",
1919
"versions": ["1.3"]
2020
},
2121
{
2222
"name": "meta",
2323
"versions": ["1.3"]
2424
},
2525
{
26-
"name": "meta-alpine",
26+
"name": "meta/alpine",
2727
"versions": ["1.3"]
2828
}
2929
]

0 commit comments

Comments
 (0)