Skip to content

Commit 80158ef

Browse files
clemlesneclemlesne
committed
Merge branch 'develop'
2 parents ff22f4a + b3ff51a commit 80158ef

12 files changed

Lines changed: 663 additions & 143 deletions

File tree

‎.github/workflows/pipeline.yaml‎

Lines changed: 43 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -21,62 +21,61 @@ env:
2121
CONTAINER_REGISTRY_GHCR: ghcr.io
2222
CONTAINER_REGISTRY_DOCKER_HUB: docker.io
2323
# https://github.com/sigstore/cosign/releases
24-
COSIGN_VERSION: 2.4.0
24+
COSIGN_VERSION: 2.4.1
2525
# https://npmjs.com/package/@microsoft/sarif-multitool?activeTab=versions
2626
SARIF_MULTITOOL_VERSION: 4.5.4
2727
# https://npmjs.com/package/snyk?activeTab=versions
28-
SNYK_VERSION: 1.1293.0
28+
SNYK_VERSION: 1.1293.1
2929
# https://github.com/microsoft/azure-pipelines-agent/releases
30-
AZP_AGENT_VERSION: 3.243.1
30+
AZP_AGENT_VERSION: 3.244.1
3131
# https://github.com/PowerShell/PowerShell/releases
3232
POWERSHELL_VERSION: 7.2.23
3333
# https://github.com/krallin/tini/releases
3434
TINI_VERSION: 0.19.0
3535
# https://github.com/mikefarah/yq/releases
3636
YQ_VERSION: 4.44.3
3737
# https://go.dev/dl
38-
GO_VERSION: 1.23.0
38+
GO_VERSION: 1.23.2
3939
# https://github.com/rootless-containers/rootlesskit/releases
4040
ROOTLESSKIT_VERSION: 2.3.1
4141
# https://github.com/moby/buildkit/releases
42-
BUILDKIT_VERSION: 0.15.2
42+
BUILDKIT_VERSION: 0.16.0
4343
# https://github.com/Azure/azure-cli/releases
44-
AZURE_CLI_VERSION: 2.63.0
44+
AZURE_CLI_VERSION: 2.65.0
4545
# https://github.com/stedolan/jq/releases
46-
# Note: This version requires to be available from Debian and Ubuntu repositories (see https://packages.debian.org/bookworm/jq for example)
47-
JQ_VERSION: 1.6
46+
JQ_WIN_VERSION: 1.7.1
4847
# https://github.com/aws/aws-cli/tags
49-
AWS_CLI_VERSION: 2.17.42
48+
AWS_CLI_VERSION: 2.18.4
5049
# https://console.cloud.google.com/artifacts/docker/google.com:cloudsdktool/us/gcr.io/google-cloud-cli
5150
# Note: To get thhe version number, spot the version tag on the latest pushed container
5251
GCLOUD_CLI_VERSION: 490.0.0
5352
# https://github.com/git-for-windows/git/releases
54-
GIT_WIN_VERSION: 2.46.0
53+
GIT_WIN_VERSION: 2.47.0
5554
# https://github.com/facebook/zstd/releases
5655
ZSTD_WIN_VERSION: 1.5.6
5756
# https://www.python.org/downloads/windows
58-
PYTHON_WIN_VERSION: 3.12.5
57+
PYTHON_VERSION: 3.12.7
5958
# https://nodejs.org/en/download/releases
60-
NODE_VERSION: 20.17.0
59+
NODE_VERSION: 20.18.0
6160
# https://github.com/helm/helm/releases
62-
HELM_VERSION: 3.15.4
61+
HELM_VERSION: 3.16.2
6362
# https://github.com/oras-project/oras/releases
64-
ORAS_VERSION: 1.1.0
63+
ORAS_VERSION: 1.2.0
6564
# https://github.com/docker/buildx/releases
66-
BUILDX_VERSION: 0.16.2
65+
BUILDX_VERSION: 0.17.1
6766
# https://github.com/hadolint/hadolint/releases
6867
HADOLINT_VERSION: 2.12.0
6968
# https://learn.microsoft.com/en-us/visualstudio/releases/2022/release-history#fixed-version-bootstrappers
70-
VS_BUILDTOOLS_WIN_VERSION: 28626b4b-f88f-4b55-a0cf-f3eaa2c643fb/e6c43d4dfb36338d954cdb3ad9010ab2a479e712088f4f6b016eadcc721bab28 # LTSC 17.10 (17.10.35201.131)
69+
VS_BUILDTOOLS_WIN_VERSION: 80c57218-b55f-4260-af46-a64ffd76e7a6/7fee719abc3ba9eced84ea258ccae39a7b0cc953b539c2ea3a98c3ff588b7870
7170
# https://github.com/gohugoio/hugo/releases
72-
HUGO_VERSION: 0.133.1
71+
HUGO_VERSION: 0.135.0
7372
# See: https://github.com/getsops/sops/releases
74-
SOPS_VERSION: 3.9.0
73+
SOPS_VERSION: 3.9.1
7574

7675
jobs:
7776
init:
7877
name: Initialize
79-
runs-on: ubuntu-22.04
78+
runs-on: ubuntu-24.04
8079
outputs:
8180
BRANCH: ${{ steps.branch.outputs.branch }}
8281
VERSION_FULL: ${{ steps.version.outputs.version_full }}
@@ -104,7 +103,7 @@ jobs:
104103
105104
sast-creds:
106105
name: SAST - Credentials
107-
runs-on: ubuntu-22.04
106+
runs-on: ubuntu-24.04
108107
steps:
109108
- name: Checkout
110109
uses: actions/checkout@v4.1.7
@@ -128,7 +127,7 @@ jobs:
128127
- sast-creds
129128
- sast-semgrep
130129
- static-test
131-
runs-on: ubuntu-22.04
130+
runs-on: ubuntu-24.04
132131
steps:
133132
- name: Checkout
134133
uses: actions/checkout@v4.1.7
@@ -206,6 +205,9 @@ jobs:
206205
# Fix issue "Error: Code Scanning could not process the submitted SARIF file: rejecting SARIF, as there are more runs than allowed (XX > 20)"
207206
# See: https://github.com/github/codeql-action/issues/220
208207
- name: Merge SARIF files
208+
env:
209+
# See: https://github.com/dotnet/core/issues/2186#issuecomment-1935707348
210+
DOTNET_SYSTEM_GLOBALIZATION_INVARIANT: "1"
209211
run: |
210212
npx --yes @microsoft/sarif-multitool@${{ env.SARIF_MULTITOOL_VERSION }} merge \
211213
--automation-id ${{ github.run_id }} \
@@ -227,7 +229,7 @@ jobs:
227229
- build-helm
228230
# Only deploy on non-scheduled main branch, as there is only one Helm repo and we cannot override an existing version
229231
if: (github.event_name != 'schedule') && (github.ref == 'refs/heads/main')
230-
runs-on: ubuntu-22.04
232+
runs-on: ubuntu-24.04
231233
steps:
232234
- name: Checkout
233235
uses: actions/checkout@v4.1.7
@@ -257,7 +259,7 @@ jobs:
257259

258260
static-test:
259261
name: Static test
260-
runs-on: ubuntu-22.04
262+
runs-on: ubuntu-24.04
261263
steps:
262264
- name: Checkout
263265
uses: actions/checkout@v4.1.7
@@ -290,7 +292,7 @@ jobs:
290292
- sast-creds
291293
- sast-semgrep
292294
- static-test
293-
runs-on: ubuntu-22.04
295+
runs-on: ubuntu-24.04
294296
strategy:
295297
fail-fast: false
296298
matrix:
@@ -303,6 +305,8 @@ jobs:
303305
arch: linux/amd64,linux/arm64
304306
- os: jammy
305307
arch: linux/amd64,linux/arm64
308+
- os: noble
309+
arch: linux/amd64,linux/arm64
306310
- os: ubi8
307311
arch: linux/amd64,linux/arm64
308312
- os: ubi9
@@ -402,13 +406,13 @@ jobs:
402406
with:
403407
build-args: |
404408
AWS_CLI_VERSION=${{ env.AWS_CLI_VERSION }}
405-
GCLOUD_CLI_VERSION=${{ env.GCLOUD_CLI_VERSION }}
406409
AZP_AGENT_VERSION=${{ env.AZP_AGENT_VERSION }}
407410
AZURE_CLI_VERSION=${{ env.AZURE_CLI_VERSION }}
408411
BUILDKIT_VERSION=${{ env.BUILDKIT_VERSION }}
412+
GCLOUD_CLI_VERSION=${{ env.GCLOUD_CLI_VERSION }}
409413
GO_VERSION=${{ env.GO_VERSION }}
410-
JQ_VERSION=${{ env.JQ_VERSION }}
411414
POWERSHELL_VERSION=${{ env.POWERSHELL_VERSION }}
415+
PYTHON_VERSION=${{ env.PYTHON_VERSION }}
412416
ROOTLESSKIT_VERSION=${{ env.ROOTLESSKIT_VERSION }}
413417
TINI_VERSION=${{ env.TINI_VERSION }}
414418
YQ_VERSION=${{ env.YQ_VERSION }}
@@ -460,6 +464,9 @@ jobs:
460464
# Fix issue "Error: Code Scanning could not process the submitted SARIF file: rejecting SARIF, as there are more runs than allowed (XX > 20)"
461465
# See: https://github.com/github/codeql-action/issues/220
462466
- name: Merge SARIF files
467+
env:
468+
# See: https://github.com/dotnet/core/issues/2186#issuecomment-1935707348
469+
DOTNET_SYSTEM_GLOBALIZATION_INVARIANT: "1"
463470
run: |
464471
npx --yes @microsoft/sarif-multitool@${{ env.SARIF_MULTITOOL_VERSION }} merge \
465472
--automation-id ${{ github.run_id }} \
@@ -574,9 +581,9 @@ jobs:
574581
"--build-arg", "AZURE_CLI_VERSION=${{ env.AZURE_CLI_VERSION }}",
575582
"--build-arg", "GCLOUD_CLI_VERSION=${{ env.GCLOUD_CLI_VERSION }}",
576583
"--build-arg", "GIT_VERSION=${{ env.GIT_WIN_VERSION }}",
577-
"--build-arg", "JQ_VERSION=${{ env.JQ_VERSION }}",
584+
"--build-arg", "JQ_VERSION=${{ env.JQ_WIN_VERSION }}",
578585
"--build-arg", "POWERSHELL_VERSION=${{ env.POWERSHELL_VERSION }}",
579-
"--build-arg", "PYTHON_VERSION=${{ env.PYTHON_WIN_VERSION }}",
586+
"--build-arg", "PYTHON_VERSION=${{ env.PYTHON_VERSION }}",
580587
"--build-arg", "VS_BUILDTOOLS_VERSION=${{ env.VS_BUILDTOOLS_WIN_VERSION }}",
581588
"--build-arg", "YQ_VERSION=${{ env.YQ_VERSION }}",
582589
"--build-arg", "ZSTD_VERSION=${{ env.ZSTD_WIN_VERSION }}",
@@ -670,7 +677,7 @@ jobs:
670677

671678
sast-semgrep:
672679
name: SAST - Semgrep
673-
runs-on: ubuntu-22.04
680+
runs-on: ubuntu-24.04
674681
container:
675682
image: returntocorp/semgrep
676683
steps:
@@ -694,13 +701,13 @@ jobs:
694701
name: Deploy ArtifactHub metadata
695702
# Only deploy on main branch, as we don't want to break verification with a bad metadata file during development
696703
if: github.ref == 'refs/heads/main'
697-
runs-on: ubuntu-22.04
704+
runs-on: ubuntu-24.04
698705
steps:
699706
- name: Checkout
700707
uses: actions/checkout@v4.1.7
701708

702709
- name: Setup ORAS
703-
uses: oras-project/setup-oras@v1.1.0
710+
uses: oras-project/setup-oras@v1.2.0
704711
with:
705712
version: ${{ env.ORAS_VERSION }}
706713

@@ -737,7 +744,7 @@ jobs:
737744
- build-release-win
738745
# Only deploy on non-scheduled main branch, as there is only one Helm repo and we cannot override an existing version
739746
if: (github.event_name != 'schedule') && (github.ref == 'refs/heads/main')
740-
runs-on: ubuntu-22.04
747+
runs-on: ubuntu-24.04
741748
steps:
742749
- name: Checkout
743750
uses: actions/checkout@v4.1.7
@@ -753,7 +760,7 @@ jobs:
753760

754761
build-hugo:
755762
name: Build Hugo site
756-
runs-on: ubuntu-22.04
763+
runs-on: ubuntu-24.04
757764
needs:
758765
- sast-creds
759766
- sast-semgrep
@@ -803,7 +810,7 @@ jobs:
803810
- init
804811
# Only deploy on non-scheduled main branch, as there is only one Helm repo and we cannot override an existing version
805812
if: (github.event_name != 'schedule') && (github.ref == 'refs/heads/main')
806-
runs-on: ubuntu-22.04
813+
runs-on: ubuntu-24.04
807814
steps:
808815
- name: Pull from gh-pages
809816
uses: actions/checkout@v4.1.7
@@ -837,7 +844,7 @@ jobs:
837844
838845
integration-test:
839846
name: Integration test (Linux ${{ matrix.os }})
840-
runs-on: ubuntu-22.04
847+
runs-on: ubuntu-24.04
841848
needs:
842849
- init
843850
- sast-creds
@@ -851,7 +858,7 @@ jobs:
851858
# Rate limiting on Azure DevOps SaaS APIs is triggered quickluy by integration tests, so we need to limit the number of parallel jobs
852859
max-parallel: 3
853860
matrix:
854-
os: [bookworm, bullseye, focal, jammy, ubi8, ubi9]
861+
os: [bookworm, bullseye, focal, jammy, noble, ubi8, ubi9]
855862
steps:
856863
- name: Checkout
857864
uses: actions/checkout@v4.1.7

‎cicd/docker-build-local.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ for suffix in ${SUFFIXES}; do
4848
--build-arg "GO_VERSION=${GO_VERSION}" \
4949
--build-arg "JQ_VERSION=${JQ_VERSION}" \
5050
--build-arg "POWERSHELL_VERSION=${POWERSHELL_VERSION}" \
51-
--build-arg "PYTHON_VERSION=${PYTHON_WIN_VERSION}" \
51+
--build-arg "PYTHON_VERSION=${PYTHON_VERSION}" \
5252
--build-arg "ROOTLESSKIT_VERSION=${ROOTLESSKIT_VERSION}" \
5353
--build-arg "TINI_VERSION=${TINI_VERSION}" \
5454
--build-arg "VS_BUILDTOOLS_VERSION=${VS_BUILDTOOLS_WIN_VERSION}" \

‎docs/content/docs/advanced-topics/provided-software.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ Softwares are operating system specific. The following table lists the softwares
1818
- [zsh](https://www.zsh.org)
1919
- Programming languages
2020
- [ASP.NET Core Runtime](https://github.com/dotnet/aspnetcore)
21-
- Python ([Python 3.8](https://www.python.org/downloads/release/python-380), [Python 3.9](https://www.python.org/downloads/release/python-390), [Python 3.10](https://www.python.org/downloads/release/python-3100), [Python 3.11](https://www.python.org/downloads/release/python-3110), depending of the system, plus C/Rust build tools for libs non pre-built on the platforms)
21+
- [Python 3.12](https://docs.python.org/3/whatsnew/3.12.html)
2222
- Tools
2323
- [git](https://github.com/git-for-windows/git)
2424
- [gzip](https://www.gnu.org/software/gzip)
@@ -43,7 +43,7 @@ Softwares are operating system specific. The following table lists the softwares
4343
- [Windows PowerShell](https://learn.microsoft.com/en-us/powershell/scripting/windows-powershell/install/installing-windows-powershell?view=powershell-7.3)
4444
- Programming languages
4545
- [.NET SDK](https://dotnet.microsoft.com)
46-
- [Python 3.11](https://www.python.org/downloads/release/python-3110)
46+
- [Python 3.12](https://docs.python.org/3/whatsnew/3.12.html)
4747
- [Visual Studio Build Tools](https://learn.microsoft.com/en-us/visualstudio/ide/?view=vs-2022) (with `AzureBuildTools`, `VCTools`, `WebBuildTools`, `ManagedDesktopBuildTools`, `OfficeBuildTools` workloads)
4848
- Tools
4949
- [git](https://github.com/git-for-windows/git)

‎docs/content/docs/getting-started.md‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,12 +86,13 @@ OS support is generally called "flavor" in this documentation. The following tab
8686
| ------------------------------------------------ | ---------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------ | ------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------- |
8787
| `ghcr.io/clemlesne/blue-agent:bookworm-main` | [Debian Bookworm (12)](https://www.debian.org/releases/bookworm) slim | ![Docker Image Size (tag)](https://img.shields.io/docker/image-size/clemlesne/blue-agent/bookworm-main?label=) | `amd64`, `arm64/v8` | [See Debian LTS wiki.](https://wiki.debian.org/LTS) |
8888
| `ghcr.io/clemlesne/blue-agent:bullseye-main` | [Debian Bullseye (11)](https://www.debian.org/releases/bullseye) slim | ![Docker Image Size (tag)](https://img.shields.io/docker/image-size/clemlesne/blue-agent/bullseye-main?label=) | `amd64`, `arm64/v8` | [See Debian LTS wiki.](https://wiki.debian.org/LTS) |
89-
| `ghcr.io/clemlesne/blue-agent:focal-main` | [Ubuntu Focal (20.04)](https://www.releases.ubuntu.com/focal) minimal | ![Docker Image Size (tag)](https://img.shields.io/docker/image-size/clemlesne/blue-agent/focal-main?label=) | `amd64`, `arm64/v8` | [See Ubuntu LTS wiki.](https://wiki.ubuntu.com/Releases) |
89+
| `ghcr.io/clemlesne/blue-agent:noble-main` | [Ubuntu Noble (24.04)](https://www.releases.ubuntu.com/noble) minimal | ![Docker Image Size (tag)](https://img.shields.io/docker/image-size/clemlesne/blue-agent/noble-main?label=) | `amd64`, `arm64/v8` | [See Ubuntu LTS wiki.](https://wiki.ubuntu.com/Releases) |
9090
| `ghcr.io/clemlesne/blue-agent:jammy-main` | [Ubuntu Jammy (22.04)](https://www.releases.ubuntu.com/jammy) minimal | ![Docker Image Size (tag)](https://img.shields.io/docker/image-size/clemlesne/blue-agent/jammy-main?label=) | `amd64`, `arm64/v8` | [See Ubuntu LTS wiki.](https://wiki.ubuntu.com/Releases) |
91-
| `ghcr.io/clemlesne/blue-agent:ubi8-main` | [Red Hat UBI 8](https://developers.redhat.com/articles/ubi-faq) minimal | ![Docker Image Size (tag)](https://img.shields.io/docker/image-size/clemlesne/blue-agent/ubi8-main?label=) | `amd64`, `arm64/v8` | [See Red Hat product life cycles.](https://access.redhat.com/product-life-cycles/?product=Red%20Hat%20Enterprise%20Linux) |
91+
| `ghcr.io/clemlesne/blue-agent:focal-main` | [Ubuntu Focal (20.04)](https://www.releases.ubuntu.com/focal) minimal | ![Docker Image Size (tag)](https://img.shields.io/docker/image-size/clemlesne/blue-agent/focal-main?label=) | `amd64`, `arm64/v8` | [See Ubuntu LTS wiki.](https://wiki.ubuntu.com/Releases) |
9292
| `ghcr.io/clemlesne/blue-agent:ubi9-main` | [Red Hat UBI 9](https://developers.redhat.com/articles/ubi-faq) minimal | ![Docker Image Size (tag)](https://img.shields.io/docker/image-size/clemlesne/blue-agent/ubi9-main?label=) | `amd64`, `arm64/v8` | [See Red Hat product life cycles.](https://access.redhat.com/product-life-cycles/?product=Red%20Hat%20Enterprise%20Linux) |
93-
| `ghcr.io/clemlesne/blue-agent:win-ltsc2019-main` | [Windows Server 2019](https://learn.microsoft.com/en-us/windows-server) Core | ![Docker Image Size (tag)](https://img.shields.io/docker/image-size/clemlesne/blue-agent/win-ltsc2019-main?label=) | `amd64` | [See base image servicing lifecycles.](https://learn.microsoft.com/en-us/virtualization/windowscontainers/deploy-containers/base-image-lifecycle) |
93+
| `ghcr.io/clemlesne/blue-agent:ubi8-main` | [Red Hat UBI 8](https://developers.redhat.com/articles/ubi-faq) minimal | ![Docker Image Size (tag)](https://img.shields.io/docker/image-size/clemlesne/blue-agent/ubi8-main?label=) | `amd64`, `arm64/v8` | [See Red Hat product life cycles.](https://access.redhat.com/product-life-cycles/?product=Red%20Hat%20Enterprise%20Linux) |
9494
| `ghcr.io/clemlesne/blue-agent:win-ltsc2022-main` | [Windows Server 2022](https://learn.microsoft.com/en-us/windows-server) Core | ![Docker Image Size (tag)](https://img.shields.io/docker/image-size/clemlesne/blue-agent/win-ltsc2022-main?label=) | `amd64` | [See base image servicing lifecycles.](https://learn.microsoft.com/en-us/virtualization/windowscontainers/deploy-containers/base-image-lifecycle) |
95+
| `ghcr.io/clemlesne/blue-agent:win-ltsc2019-main` | [Windows Server 2019](https://learn.microsoft.com/en-us/windows-server) Core | ![Docker Image Size (tag)](https://img.shields.io/docker/image-size/clemlesne/blue-agent/win-ltsc2019-main?label=) | `amd64` | [See base image servicing lifecycles.](https://learn.microsoft.com/en-us/virtualization/windowscontainers/deploy-containers/base-image-lifecycle) |
9596

9697
## Docker Hub images
9798

‎src/bicep/main.bicep‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ param extraEnv array = []
1212
'bullseye'
1313
'focal'
1414
'jammy'
15+
'noble'
1516
'ubi8'
1617
'ubi9'
1718
])

0 commit comments

Comments
 (0)