Skip to content

Commit 26de80b

Browse files
olljanatolljanat
committed
packaging: Start producing container images for Windows 2025 (#339)
1 parent 6d46fb8 commit 26de80b

File tree

10 files changed

+99
-4
lines changed

10 files changed

+99
-4
lines changed

‎.github/workflows/release-contrib.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,6 @@ jobs:
2323
distribution: otelcol-contrib
2424
goos: '[ "windows" ]'
2525
goarch: '[ "386", "amd64" ]'
26-
runner_os: windows-2022
26+
runner_os: windows-2025
2727
secrets: inherit
2828
permissions: write-all

‎.github/workflows/release-core.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,6 @@ jobs:
2323
distribution: otelcol
2424
goos: '[ "windows" ]'
2525
goarch: '[ "386", "amd64" ]'
26-
runner_os: windows-2022
26+
runner_os: windows-2025
2727
secrets: inherit
2828
permissions: write-all

‎.github/workflows/release-k8s.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,6 @@ jobs:
2323
distribution: otelcol-k8s
2424
goos: '[ "windows" ]'
2525
goarch: '[ "386", "amd64" ]'
26-
runner_os: windows-2022
26+
runner_os: windows-2025
2727
secrets: inherit
2828
permissions: write-all

‎.github/workflows/release-otlp.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,6 @@ jobs:
2323
distribution: otelcol-otlp
2424
goos: '[ "windows" ]'
2525
goarch: '[ "386", "amd64" ]'
26-
runner_os: windows-2022
26+
runner_os: windows-2025
2727
secrets: inherit
2828
permissions: write-all

‎CHANGELOG.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33
# Changelog
44

55
<!-- next version -->
6+
### 💡 Enhancements 💡
7+
8+
- `packaging`: Start producing container images for Windows 2025 on amd64 (#339)
69

710
## v0.132.0
811

‎cmd/goreleaser/internal/configure.go‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ var (
7171
newContainerImages(d.name, "linux", baseArchs, containerImageOptions{armVersion: "7"}),
7272
newContainerImages(d.name, "windows", winContainerArchs, containerImageOptions{winVersion: "2019"}),
7373
newContainerImages(d.name, "windows", winContainerArchs, containerImageOptions{winVersion: "2022"}),
74+
newContainerImages(d.name, "windows", winContainerArchs, containerImageOptions{winVersion: "2025"}),
7475
)
7576
d.containerImageManifests = slices.Concat(
7677
newContainerImageManifests(d.name, "linux", baseArchs, containerImageOptions{}),
@@ -88,6 +89,7 @@ var (
8889
newContainerImages(d.name, "linux", baseArchs, containerImageOptions{armVersion: "7"}),
8990
newContainerImages(d.name, "windows", winContainerArchs, containerImageOptions{winVersion: "2019"}),
9091
newContainerImages(d.name, "windows", winContainerArchs, containerImageOptions{winVersion: "2022"}),
92+
newContainerImages(d.name, "windows", winContainerArchs, containerImageOptions{winVersion: "2025"}),
9193
)
9294
d.containerImageManifests = slices.Concat(
9395
newContainerImageManifests(d.name, "linux", baseArchs, containerImageOptions{}),
@@ -123,6 +125,7 @@ var (
123125
newContainerImages(d.name, "linux", baseArchs, containerImageOptions{armVersion: "7"}),
124126
newContainerImages(d.name, "windows", winContainerArchs, containerImageOptions{winVersion: "2019"}),
125127
newContainerImages(d.name, "windows", winContainerArchs, containerImageOptions{winVersion: "2022"}),
128+
newContainerImages(d.name, "windows", winContainerArchs, containerImageOptions{winVersion: "2025"}),
126129
)
127130
d.containerImageManifests = slices.Concat(
128131
newContainerImageManifests(d.name, "linux", baseArchs, containerImageOptions{}),
@@ -154,6 +157,7 @@ var (
154157
newContainerImages(d.name, "linux", k8sArchs, containerImageOptions{armVersion: "7"}),
155158
newContainerImages(d.name, "windows", winContainerArchs, containerImageOptions{winVersion: "2019"}),
156159
newContainerImages(d.name, "windows", winContainerArchs, containerImageOptions{winVersion: "2022"}),
160+
newContainerImages(d.name, "windows", winContainerArchs, containerImageOptions{winVersion: "2025"}),
157161
)
158162
d.containerImageManifests = slices.Concat(
159163
newContainerImageManifests(d.name, "linux", k8sArchs, containerImageOptions{}),

‎distributions/otelcol-contrib/.goreleaser.yaml‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -293,6 +293,29 @@ dockers:
293293
- --label=org.opencontainers.image.source={{.GitURL}}
294294
- --label=org.opencontainers.image.licenses=Apache-2.0
295295
use: docker
296+
- goos: windows
297+
goarch: amd64
298+
dockerfile: Windows.dockerfile
299+
image_templates:
300+
- otel/opentelemetry-collector-contrib:{{ .Version }}-windows-2025-amd64
301+
- otel/opentelemetry-collector-contrib:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-windows-2025-amd64
302+
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Version }}-windows-2025-amd64
303+
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-contrib:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-windows-2025-amd64
304+
skip_build: '{{ not (eq .Runtime.Goos "windows") }}'
305+
skip_push: '{{ not (eq .Runtime.Goos "windows") }}'
306+
extra_files:
307+
- config.yaml
308+
build_flag_templates:
309+
- --pull
310+
- --build-arg=WIN_VERSION=2025
311+
- --platform=windows/amd64
312+
- --label=org.opencontainers.image.created={{.Date}}
313+
- --label=org.opencontainers.image.name={{.ProjectName}}
314+
- --label=org.opencontainers.image.revision={{.FullCommit}}
315+
- --label=org.opencontainers.image.version={{.Version}}
316+
- --label=org.opencontainers.image.source={{.GitURL}}
317+
- --label=org.opencontainers.image.licenses=Apache-2.0
318+
use: docker
296319
docker_manifests:
297320
- name_template: otel/opentelemetry-collector-contrib:{{ .Version }}
298321
image_templates:

‎distributions/otelcol-k8s/.goreleaser.yaml‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -179,6 +179,27 @@ dockers:
179179
- --label=org.opencontainers.image.source={{.GitURL}}
180180
- --label=org.opencontainers.image.licenses=Apache-2.0
181181
use: docker
182+
- goos: windows
183+
goarch: amd64
184+
dockerfile: Windows.dockerfile
185+
image_templates:
186+
- otel/opentelemetry-collector-k8s:{{ .Version }}-windows-2025-amd64
187+
- otel/opentelemetry-collector-k8s:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-windows-2025-amd64
188+
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-k8s:{{ .Version }}-windows-2025-amd64
189+
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-k8s:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-windows-2025-amd64
190+
skip_build: '{{ not (eq .Runtime.Goos "windows") }}'
191+
skip_push: '{{ not (eq .Runtime.Goos "windows") }}'
192+
build_flag_templates:
193+
- --pull
194+
- --build-arg=WIN_VERSION=2025
195+
- --platform=windows/amd64
196+
- --label=org.opencontainers.image.created={{.Date}}
197+
- --label=org.opencontainers.image.name={{.ProjectName}}
198+
- --label=org.opencontainers.image.revision={{.FullCommit}}
199+
- --label=org.opencontainers.image.version={{.Version}}
200+
- --label=org.opencontainers.image.source={{.GitURL}}
201+
- --label=org.opencontainers.image.licenses=Apache-2.0
202+
use: docker
182203
docker_manifests:
183204
- name_template: otel/opentelemetry-collector-k8s:{{ .Version }}
184205
image_templates:

‎distributions/otelcol-otlp/.goreleaser.yaml‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -266,6 +266,27 @@ dockers:
266266
- --label=org.opencontainers.image.source={{.GitURL}}
267267
- --label=org.opencontainers.image.licenses=Apache-2.0
268268
use: docker
269+
- goos: windows
270+
goarch: amd64
271+
dockerfile: Windows.dockerfile
272+
image_templates:
273+
- otel/opentelemetry-collector-otlp:{{ .Version }}-windows-2025-amd64
274+
- otel/opentelemetry-collector-otlp:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-windows-2025-amd64
275+
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-otlp:{{ .Version }}-windows-2025-amd64
276+
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector-otlp:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-windows-2025-amd64
277+
skip_build: '{{ not (eq .Runtime.Goos "windows") }}'
278+
skip_push: '{{ not (eq .Runtime.Goos "windows") }}'
279+
build_flag_templates:
280+
- --pull
281+
- --build-arg=WIN_VERSION=2025
282+
- --platform=windows/amd64
283+
- --label=org.opencontainers.image.created={{.Date}}
284+
- --label=org.opencontainers.image.name={{.ProjectName}}
285+
- --label=org.opencontainers.image.revision={{.FullCommit}}
286+
- --label=org.opencontainers.image.version={{.Version}}
287+
- --label=org.opencontainers.image.source={{.GitURL}}
288+
- --label=org.opencontainers.image.licenses=Apache-2.0
289+
use: docker
269290
docker_manifests:
270291
- name_template: otel/opentelemetry-collector-otlp:{{ .Version }}
271292
image_templates:

‎distributions/otelcol/.goreleaser.yaml‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -288,6 +288,29 @@ dockers:
288288
- --label=org.opencontainers.image.source={{.GitURL}}
289289
- --label=org.opencontainers.image.licenses=Apache-2.0
290290
use: docker
291+
- goos: windows
292+
goarch: amd64
293+
dockerfile: Windows.dockerfile
294+
image_templates:
295+
- otel/opentelemetry-collector:{{ .Version }}-windows-2025-amd64
296+
- otel/opentelemetry-collector:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-windows-2025-amd64
297+
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector:{{ .Version }}-windows-2025-amd64
298+
- ghcr.io/open-telemetry/opentelemetry-collector-releases/opentelemetry-collector:{{ .Env.CONTAINER_IMAGE_EPHEMERAL_TAG }}-windows-2025-amd64
299+
skip_build: '{{ not (eq .Runtime.Goos "windows") }}'
300+
skip_push: '{{ not (eq .Runtime.Goos "windows") }}'
301+
extra_files:
302+
- config.yaml
303+
build_flag_templates:
304+
- --pull
305+
- --build-arg=WIN_VERSION=2025
306+
- --platform=windows/amd64
307+
- --label=org.opencontainers.image.created={{.Date}}
308+
- --label=org.opencontainers.image.name={{.ProjectName}}
309+
- --label=org.opencontainers.image.revision={{.FullCommit}}
310+
- --label=org.opencontainers.image.version={{.Version}}
311+
- --label=org.opencontainers.image.source={{.GitURL}}
312+
- --label=org.opencontainers.image.licenses=Apache-2.0
313+
use: docker
291314
docker_manifests:
292315
- name_template: otel/opentelemetry-collector:{{ .Version }}
293316
image_templates:

0 commit comments

Comments
 (0)