Support multiple versions

.circleci/config.yml

@@ -137,7 +137,7 @@ jobs:
                   gcc -v
       - with-go-cache:
           steps:
-            - run: ./do test ./...
+            - run: ./do test ./... -count 2
       - notify_failing_main
 
   build:

.goreleaser/dockers.yaml

@@ -31,6 +31,53 @@ dockers:
     extra_files:
       - ./target/bin/linux/arm64/orchestrator
 
+  # Windows images
+  - id: init-windows-server-2019
+    image_templates: ["circleci/runner-init:agent-windows-server-2019{{.Env.IMAGE_TAG_SUFFIX}}"]
+    dockerfile: ./docker/windows.Dockerfile
+    skip_push: "true" # we push during the build step since we cannot load a Windows image on Linux
+    use: buildx
+    build_flag_templates:
+      - "--builder=circleci-runner-init-windows-builder"
+      - "--build-arg=PICARD_VERSION={{.Env.PICARD_VERSION}}"
+      - "--build-arg=WINDOWS_VERSION=ltsc2019"
+      - "--platform=windows/amd64"
+      - "--load=false"
+      - "--push={{.Env.PUSH_WINDOWS}}"
+      - "--provenance=false"
+    extra_files:
+      - ./target/bin/windows/amd64/orchestrator.exe
+  - id: init-windows-server-2022
+    image_templates: ["circleci/runner-init:agent-windows-server-2022{{.Env.IMAGE_TAG_SUFFIX}}"]
+    dockerfile: ./docker/windows.Dockerfile
+    skip_push: "true" # we push during the build step since we cannot load a Windows image on Linux
+    use: buildx
+    build_flag_templates:
+      - "--builder=circleci-runner-init-windows-builder"
+      - "--build-arg=PICARD_VERSION={{.Env.PICARD_VERSION}}"
+      - "--build-arg=WINDOWS_VERSION=ltsc2022"
+      - "--platform=windows/amd64"
+      - "--load=false"
+      - "--push={{.Env.PUSH_WINDOWS}}"
+      - "--provenance=false"
+    extra_files:
+      - ./target/bin/windows/amd64/orchestrator.exe
+  - id: init-windows-server-2025
+    image_templates: ["circleci/runner-init:agent-windows-server-2025{{.Env.IMAGE_TAG_SUFFIX}}"]
+    dockerfile: ./docker/windows.Dockerfile
+    skip_push: "true" # we push during the build step since we cannot load a Windows image on Linux
+    use: buildx
+    build_flag_templates:
+      - "--builder=circleci-runner-init-windows-builder"
+      - "--build-arg=PICARD_VERSION={{.Env.PICARD_VERSION}}"
+      - "--build-arg=WINDOWS_VERSION=ltsc2025"
+      - "--platform=windows/amd64"
+      - "--load=false"
+      - "--push={{.Env.PUSH_WINDOWS}}"
+      - "--provenance=false"
+    extra_files:
+      - ./target/bin/windows/amd64/orchestrator.exe
+
   # Image used in the `circleci-runner` acceptance tests
   - id: testinit-amd64
     image_templates: ["circleci/runner-init:test-agent-amd64"]
@@ -48,7 +95,9 @@ docker_manifests:
     image_templates:
       - "circleci/runner-init:agent-amd64{{.Env.IMAGE_TAG_SUFFIX}}"
       - "circleci/runner-init:agent-arm64{{.Env.IMAGE_TAG_SUFFIX}}"
-      - "circleci/runner-init:agent-windows{{.Env.IMAGE_TAG_SUFFIX}}"
+      - "circleci/runner-init:agent-windows-server-2019{{.Env.IMAGE_TAG_SUFFIX}}"
+      - "circleci/runner-init:agent-windows-server-2022{{.Env.IMAGE_TAG_SUFFIX}}"
+      - "circleci/runner-init:agent-windows-server-2025{{.Env.IMAGE_TAG_SUFFIX}}"
     skip_push: "{{.Env.SKIP_PUSH}}"
 
   - name_template: "circleci/runner-init:test-agent"

docker/windows.Dockerfile

@@ -1,4 +1,5 @@
 ARG PICARD_VERSION=agent
+ARG WINDOWS_VERSION
 
 FROM --platform=${BUILDPLATFORM} circleci/picard:${PICARD_VERSION} AS task-agent-image
 
@@ -9,10 +10,8 @@ ARG TARGETPLATFORM
 COPY --from=task-agent-image /opt/circleci/${TARGETPLATFORM}/circleci-agent /circleci-agent.exe
 COPY ./target/bin/${TARGETPLATFORM}/orchestrator.exe /
 
-FROM mcr.microsoft.com/windows/nanoserver:ltsc2019
+FROM mcr.microsoft.com/windows/nanoserver:${WINDOWS_VERSION}
 
 COPY --from=builder / /
 
-WORKDIR /
-
-ENTRYPOINT ["orchestrator.exe", "init"]
+ENTRYPOINT ["/orchestrator", "init"]