Skip to content

Commit db417da

Browse files
francislavoiefrancislavoie
committed
Dedupe GitRepo, wire up potential buildkit support for later
1 parent e390b5a commit db417da

File tree

3 files changed

+31
-36
lines changed

3 files changed

+31
-36
lines changed

‎library/caddy‎

Lines changed: 19 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,130 +1,115 @@
11
# this file is generated with gomplate:
2-
# template: https://github.com/caddyserver/caddy-docker/blob/e05f66898af9a0a694af637db2724f91d9d82ed7/stackbrew.tmpl
3-
# config context: https://github.com/caddyserver/caddy-docker/blob/08508564e927b906aa16e561f46468c1b6fb2116/stackbrew-config.yaml
2+
# template: https://github.com/caddyserver/caddy-docker/blob/80941afcdb5aa82d13abfe1ddbef29a25c6d7452/tmpl/stackbrew.tmpl
3+
# config context: https://github.com/caddyserver/caddy-docker/blob/651ac7154b2eba8c204ef9a840bf30782defa929/stackbrew-config.yaml
44
Maintainers: Dave Henderson (@hairyhenderson),
55
Francis Lavoie (@francislavoie)
6+
GitRepo: https://github.com/caddyserver/caddy-docker.git
67

78
Tags: 2.11.0-beta.1-alpine, 2.11-alpine
89
SharedTags: 2.11.0-beta.1, 2.11
9-
GitRepo: https://github.com/caddyserver/caddy-docker.git
1010
Directory: 2.11/alpine
11-
GitCommit: 33c593c5bd99287e66de4187a4e9a4097426253d
11+
GitCommit: 4192ea459a02a355be6f586173ac25c911f1614d
1212
Architectures: amd64, arm64v8, arm32v6, arm32v7, ppc64le, riscv64, s390x
1313

1414
Tags: 2.11.0-beta.1-builder-alpine, 2.11-builder-alpine
1515
SharedTags: 2.11.0-beta.1-builder, 2.11-builder
16-
GitRepo: https://github.com/caddyserver/caddy-docker.git
1716
Directory: 2.11/builder
18-
GitCommit: 33c593c5bd99287e66de4187a4e9a4097426253d
17+
GitCommit: 4192ea459a02a355be6f586173ac25c911f1614d
1918
Architectures: amd64, arm64v8, arm32v6, arm32v7, ppc64le, riscv64, s390x
2019

2120
Tags: 2.11.0-beta.1-windowsservercore-ltsc2022, 2.11-windowsservercore-ltsc2022
2221
SharedTags: 2.11.0-beta.1-windowsservercore, 2.11-windowsservercore, 2.11.0-beta.1, 2.11
23-
GitRepo: https://github.com/caddyserver/caddy-docker.git
2422
Directory: 2.11/windows/ltsc2022
25-
GitCommit: 33c593c5bd99287e66de4187a4e9a4097426253d
23+
GitCommit: 4192ea459a02a355be6f586173ac25c911f1614d
2624
Architectures: windows-amd64
2725
Constraints: windowsservercore-ltsc2022
2826

2927
Tags: 2.11.0-beta.1-windowsservercore-ltsc2025, 2.11-windowsservercore-ltsc2025
3028
SharedTags: 2.11.0-beta.1-windowsservercore, 2.11-windowsservercore, 2.11.0-beta.1, 2.11
31-
GitRepo: https://github.com/caddyserver/caddy-docker.git
3229
Directory: 2.11/windows/ltsc2025
33-
GitCommit: 33c593c5bd99287e66de4187a4e9a4097426253d
30+
GitCommit: 4192ea459a02a355be6f586173ac25c911f1614d
3431
Architectures: windows-amd64
3532
Constraints: windowsservercore-ltsc2025
3633

3734
Tags: 2.11.0-beta.1-nanoserver-ltsc2022, 2.11-nanoserver-ltsc2022
3835
SharedTags: 2.11.0-beta.1-nanoserver, 2.11-nanoserver
39-
GitRepo: https://github.com/caddyserver/caddy-docker.git
4036
Directory: 2.11/windows-nanoserver/ltsc2022
41-
GitCommit: 33c593c5bd99287e66de4187a4e9a4097426253d
37+
GitCommit: 4192ea459a02a355be6f586173ac25c911f1614d
4238
Architectures: windows-amd64
4339
Constraints: nanoserver-ltsc2022, windowsservercore-ltsc2022
4440

4541
Tags: 2.11.0-beta.1-nanoserver-ltsc2025, 2.11-nanoserver-ltsc2025
4642
SharedTags: 2.11.0-beta.1-nanoserver, 2.11-nanoserver
47-
GitRepo: https://github.com/caddyserver/caddy-docker.git
4843
Directory: 2.11/windows-nanoserver/ltsc2025
49-
GitCommit: 33c593c5bd99287e66de4187a4e9a4097426253d
44+
GitCommit: 4192ea459a02a355be6f586173ac25c911f1614d
5045
Architectures: windows-amd64
5146
Constraints: nanoserver-ltsc2025, windowsservercore-ltsc2025
5247

5348
Tags: 2.11.0-beta.1-builder-windowsservercore-ltsc2022, 2.11-builder-windowsservercore-ltsc2022
5449
SharedTags: 2.11.0-beta.1-builder, 2.11-builder
55-
GitRepo: https://github.com/caddyserver/caddy-docker.git
5650
Directory: 2.11/windows-builder/ltsc2022
57-
GitCommit: 33c593c5bd99287e66de4187a4e9a4097426253d
51+
GitCommit: 4192ea459a02a355be6f586173ac25c911f1614d
5852
Architectures: windows-amd64
5953
Constraints: windowsservercore-ltsc2022
6054

6155
Tags: 2.11.0-beta.1-builder-windowsservercore-ltsc2025, 2.11-builder-windowsservercore-ltsc2025
6256
SharedTags: 2.11.0-beta.1-builder, 2.11-builder
63-
GitRepo: https://github.com/caddyserver/caddy-docker.git
6457
Directory: 2.11/windows-builder/ltsc2025
65-
GitCommit: 33c593c5bd99287e66de4187a4e9a4097426253d
58+
GitCommit: 4192ea459a02a355be6f586173ac25c911f1614d
6659
Architectures: windows-amd64
6760
Constraints: windowsservercore-ltsc2025
6861

6962
Tags: 2.10.2-alpine, 2.10-alpine, 2-alpine, alpine
7063
SharedTags: 2.10.2, 2.10, 2, latest
71-
GitRepo: https://github.com/caddyserver/caddy-docker.git
7264
Directory: 2.10/alpine
73-
GitCommit: 5572371a83e48fd0368a4917d0fc48e44ef30582
65+
GitCommit: 4192ea459a02a355be6f586173ac25c911f1614d
7466
Architectures: amd64, arm64v8, arm32v6, arm32v7, ppc64le, riscv64, s390x
7567

7668
Tags: 2.10.2-builder-alpine, 2.10-builder-alpine, 2-builder-alpine, builder-alpine
7769
SharedTags: 2.10.2-builder, 2.10-builder, 2-builder, builder
78-
GitRepo: https://github.com/caddyserver/caddy-docker.git
7970
Directory: 2.10/builder
80-
GitCommit: 5572371a83e48fd0368a4917d0fc48e44ef30582
71+
GitCommit: 4192ea459a02a355be6f586173ac25c911f1614d
8172
Architectures: amd64, arm64v8, arm32v6, arm32v7, ppc64le, riscv64, s390x
8273

8374
Tags: 2.10.2-windowsservercore-ltsc2022, 2.10-windowsservercore-ltsc2022, 2-windowsservercore-ltsc2022, windowsservercore-ltsc2022
8475
SharedTags: 2.10.2-windowsservercore, 2.10-windowsservercore, 2-windowsservercore, windowsservercore, 2.10.2, 2.10, 2, latest
85-
GitRepo: https://github.com/caddyserver/caddy-docker.git
8676
Directory: 2.10/windows/ltsc2022
87-
GitCommit: 5572371a83e48fd0368a4917d0fc48e44ef30582
77+
GitCommit: 4192ea459a02a355be6f586173ac25c911f1614d
8878
Architectures: windows-amd64
8979
Constraints: windowsservercore-ltsc2022
9080

9181
Tags: 2.10.2-windowsservercore-ltsc2025, 2.10-windowsservercore-ltsc2025, 2-windowsservercore-ltsc2025, windowsservercore-ltsc2025
9282
SharedTags: 2.10.2-windowsservercore, 2.10-windowsservercore, 2-windowsservercore, windowsservercore, 2.10.2, 2.10, 2, latest
93-
GitRepo: https://github.com/caddyserver/caddy-docker.git
9483
Directory: 2.10/windows/ltsc2025
95-
GitCommit: 5572371a83e48fd0368a4917d0fc48e44ef30582
84+
GitCommit: 4192ea459a02a355be6f586173ac25c911f1614d
9685
Architectures: windows-amd64
9786
Constraints: windowsservercore-ltsc2025
9887

9988
Tags: 2.10.2-nanoserver-ltsc2022, 2.10-nanoserver-ltsc2022, 2-nanoserver-ltsc2022, nanoserver-ltsc2022
10089
SharedTags: 2.10.2-nanoserver, 2.10-nanoserver, 2-nanoserver, nanoserver
101-
GitRepo: https://github.com/caddyserver/caddy-docker.git
10290
Directory: 2.10/windows-nanoserver/ltsc2022
103-
GitCommit: 33c593c5bd99287e66de4187a4e9a4097426253d
91+
GitCommit: 4192ea459a02a355be6f586173ac25c911f1614d
10492
Architectures: windows-amd64
10593
Constraints: nanoserver-ltsc2022, windowsservercore-ltsc2022
10694

10795
Tags: 2.10.2-nanoserver-ltsc2025, 2.10-nanoserver-ltsc2025, 2-nanoserver-ltsc2025, nanoserver-ltsc2025
10896
SharedTags: 2.10.2-nanoserver, 2.10-nanoserver, 2-nanoserver, nanoserver
109-
GitRepo: https://github.com/caddyserver/caddy-docker.git
11097
Directory: 2.10/windows-nanoserver/ltsc2025
111-
GitCommit: 33c593c5bd99287e66de4187a4e9a4097426253d
98+
GitCommit: 4192ea459a02a355be6f586173ac25c911f1614d
11299
Architectures: windows-amd64
113100
Constraints: nanoserver-ltsc2025, windowsservercore-ltsc2025
114101

115102
Tags: 2.10.2-builder-windowsservercore-ltsc2022, 2.10-builder-windowsservercore-ltsc2022, 2-builder-windowsservercore-ltsc2022, builder-windowsservercore-ltsc2022
116103
SharedTags: 2.10.2-builder, 2.10-builder, 2-builder, builder
117-
GitRepo: https://github.com/caddyserver/caddy-docker.git
118104
Directory: 2.10/windows-builder/ltsc2022
119-
GitCommit: 5572371a83e48fd0368a4917d0fc48e44ef30582
105+
GitCommit: 4192ea459a02a355be6f586173ac25c911f1614d
120106
Architectures: windows-amd64
121107
Constraints: windowsservercore-ltsc2022
122108

123109
Tags: 2.10.2-builder-windowsservercore-ltsc2025, 2.10-builder-windowsservercore-ltsc2025, 2-builder-windowsservercore-ltsc2025, builder-windowsservercore-ltsc2025
124110
SharedTags: 2.10.2-builder, 2.10-builder, 2-builder, builder
125-
GitRepo: https://github.com/caddyserver/caddy-docker.git
126111
Directory: 2.10/windows-builder/ltsc2025
127-
GitCommit: 5572371a83e48fd0368a4917d0fc48e44ef30582
112+
GitCommit: 4192ea459a02a355be6f586173ac25c911f1614d
128113
Architectures: windows-amd64
129114
Constraints: windowsservercore-ltsc2025
130115

‎stackbrew-config.yaml‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,28 +24,34 @@ variants:
2424
shared_tags: [ "windowsservercore", "latest" ]
2525
architectures: [ windows-amd64 ]
2626
constraints: [ windowsservercore-ltsc2022 ]
27+
# builder: classic
2728
- dir: windows/ltsc2025
2829
tags: [ "windowsservercore-ltsc2025" ]
2930
shared_tags: [ "windowsservercore", "latest" ]
3031
architectures: [ windows-amd64 ]
3132
constraints: [ windowsservercore-ltsc2025 ]
33+
# builder: classic
3234
- dir: windows-nanoserver/ltsc2022
3335
tags: [ "nanoserver-ltsc2022" ]
3436
shared_tags: [ "nanoserver" ]
3537
architectures: [ windows-amd64 ]
3638
constraints: [ nanoserver-ltsc2022, windowsservercore-ltsc2022 ]
39+
# builder: classic
3740
- dir: windows-nanoserver/ltsc2025
3841
tags: [ "nanoserver-ltsc2025" ]
3942
shared_tags: [ "nanoserver" ]
4043
architectures: [ windows-amd64 ]
4144
constraints: [ nanoserver-ltsc2025, windowsservercore-ltsc2025 ]
45+
# builder: classic
4246
- dir: windows-builder/ltsc2022
4347
tags: [ "builder-windowsservercore-ltsc2022" ]
4448
shared_tags: [ "builder" ]
4549
architectures: [ windows-amd64 ]
4650
constraints: [ windowsservercore-ltsc2022 ]
51+
# builder: classic
4752
- dir: windows-builder/ltsc2025
4853
tags: [ "builder-windowsservercore-ltsc2025" ]
4954
shared_tags: [ "builder" ]
5055
architectures: [ windows-amd64 ]
51-
constraints: [ windowsservercore-ltsc2025 ]
56+
constraints: [ windowsservercore-ltsc2025 ]
57+
# builder: classic

‎tmpl/stackbrew.tmpl‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
# config context: https://github.com/caddyserver/caddy-docker/blob/{{ fileCommit "stackbrew-config.yaml"}}/stackbrew-config.yaml
44
Maintainers: Dave Henderson (@hairyhenderson),
55
Francis Lavoie (@francislavoie)
6+
GitRepo: https://github.com/caddyserver/caddy-docker.git
7+
{{- /* Builder: buildkit */}}
68
{{ range $version := .config.versions }}
79
{{- $minor := $version.caddy_version | regexp.Replace `([0-9]+\.[0-9]+).*$` `$1` }}
810
{{- $major := $minor | regexp.Replace `([0-9]+).*$` `$1` }}
@@ -31,12 +33,14 @@ SharedTags: {{ range $i, $tag := $variant.shared_tags }}
3133
{{ if lt (add 1 $i) (len $variant.shared_tags) }}, {{end}}
3234
{{- end }}
3335
{{- end }}
34-
GitRepo: https://github.com/caddyserver/caddy-docker.git
3536
Directory: {{ $dir }}
3637
GitCommit: {{ fileCommit $dir }}
3738
Architectures: {{ join $variant.architectures ", " }}
3839
{{- if has $variant "constraints" }}
3940
Constraints: {{ join $variant.constraints ", " }}
4041
{{- end }}
42+
{{- if has $variant "builder" }}
43+
Builder: {{ $variant.builder }}
44+
{{- end }}
4145
{{ end }}{{ end -}}
4246
{{ end }}

0 commit comments

Comments
 (0)