Build Windows container image on GitHub Actions (#3204) (#3205)

* Build Windows container image on GitHub Actions (#3204)

* update RC version

---------

Co-authored-by: Paulin Todev <[email protected]>

Author: thampiotr

.drone/drone.yml

@@ -372,44 +372,9 @@ volumes:
     path: /var/run/docker.sock
   name: docker
 ---
-kind: pipeline
-name: Publish Windows alloy container
-platform:
-  arch: amd64
-  os: windows
-  version: "1809"
-steps:
-- commands:
-  - '& "C:/Program Files/git/bin/bash.exe" -c ''mkdir -p $HOME/.docker'''
-  - '& "C:/Program Files/git/bin/bash.exe" -c ''printenv GCR_CREDS > $HOME/.docker/config.json'''
-  - '& "C:/Program Files/git/bin/bash.exe" -c ''docker login -u $DOCKER_LOGIN -p $DOCKER_PASSWORD'''
-  - '& "C:/Program Files/git/bin/bash.exe" -c ''./tools/ci/docker-containers-windows
-    alloy'''
-  environment:
-    DOCKER_LOGIN:
-      from_secret: docker_login
-    DOCKER_PASSWORD:
-      from_secret: docker_password
-    GCR_CREDS:
-      from_secret: gcr_admin
-  image: grafana/alloy-build-image:v0.1.8-windows
-  name: Build containers
-  volumes:
-  - name: docker
-    path: //./pipe/docker_engine/
-trigger:
-  ref:
-  - refs/tags/v*
-type: docker
-volumes:
-- host:
-    path: //./pipe/docker_engine/
-  name: docker
----
 depends_on:
 - Publish Linux alloy container
 - Publish Linux alloy-boringcrypto container
-- Publish Windows alloy container
 image_pull_secrets:
 - dockerconfigjson
 kind: pipeline
@@ -545,6 +510,6 @@ kind: secret
 name: updater_private_key
 ---
 kind: signature
-hmac: 97f89e50b55b8aae91afb5a7708fe2b37c935ddc48c1a71d66bc0d56953fa68d
+hmac: 89ceb7461db70e853b2d0be511054b745584d503c3fd9b45961c991b47d99727
 
 ...

.drone/pipelines/publish.jsonnet

@@ -10,9 +10,6 @@ local linux_containers = [
   { devel: 'alloy-devel', release: 'alloy' },
   { devel: 'alloy-devel-boringcrypto', release: 'alloy-boringcrypto' },
 ];
-local windows_containers = [
-  { devel: 'alloy-devel', release: 'alloy' },
-];
 
 local linux_containers_jobs = std.map(function(container) (
   pipelines.linux('Publish Linux %s container' % container.release) {
@@ -65,44 +62,13 @@ local linux_containers_jobs = std.map(function(container) (
 ), linux_containers);
 
 
-local windows_containers_jobs = std.map(function(container) (
-  pipelines.windows('Publish Windows %s container' % container.release) {
-    trigger: {
-      ref: ['refs/tags/v*'],
-    },
-    steps: [{
-      name: 'Build containers',
-      image: build_image.windows,
-      volumes: [{
-        name: 'docker',
-        path: '//./pipe/docker_engine/',
-      }],
-      environment: {
-        DOCKER_LOGIN: secrets.docker_login.fromSecret,
-        DOCKER_PASSWORD: secrets.docker_password.fromSecret,
-        GCR_CREDS: secrets.gcr_admin.fromSecret,
-      },
-      commands: [
-        pipelines.windows_command('mkdir -p $HOME/.docker'),
-        pipelines.windows_command('printenv GCR_CREDS > $HOME/.docker/config.json'),
-        pipelines.windows_command('docker login -u $DOCKER_LOGIN -p $DOCKER_PASSWORD'),
-        pipelines.windows_command('./tools/ci/docker-containers-windows %s' % container.release),
-      ],
-    }],
-    volumes: [{
-      name: 'docker',
-      host: { path: '//./pipe/docker_engine/' },
-    }],
-  }
-), windows_containers);
-
-linux_containers_jobs + windows_containers_jobs + [
+linux_containers_jobs + [
 
   pipelines.linux('Publish release') {
     trigger: {
       ref: ['refs/tags/v*'],
     },
-    depends_on: job_names(linux_containers_jobs + windows_containers_jobs),
+    depends_on: job_names(linux_containers_jobs),
     image_pull_secrets: ['dockerconfigjson'],
     steps: [
       {

.github/workflows/publish-alloy-release.yaml

@@ -0,0 +1,34 @@
+name: Publish alloy release containers
+# TODO: Reuse the config from publish-alloy-devel.yml
+on:
+  push:
+    tags:
+      - v*
+
+permissions:
+  contents: read
+  id-token: write
+
+jobs:
+  publish_windows_container:
+    name: Publish Windows alloy container
+    runs-on: windows-2022
+    steps:
+      # This step needs to run before "Checkout code".
+      # That's because it generates a new file.
+      # We don't want this file to end up in the repo directory.
+      # Then "tools/image-tag" would get confused because "git status" no longer reports a clean repo.
+    - name: Login to DockerHub (from vault)
+      uses: grafana/shared-workflows/actions/[email protected]
+
+    - name: Checkout code
+      uses: actions/checkout@v4
+
+    - name: Set up Go
+      uses: actions/setup-go@v5
+      with:
+        go-version-file: go.mod
+        cache: false
+
+    - run: |
+       & "C:/Program Files/git/bin/bash.exe" -c './tools/ci/docker-containers-windows alloy'

CHANGELOG.md

@@ -7,7 +7,7 @@ This document contains a historical list of changes between releases. Only
 changes that impact end-user behavior are listed; changes to documentation or
 internal API changes are not present.
 
-v1.8.0-rc.1
+v1.8.0-rc.2
 -----------------
 
 ### Breaking changes