Merge branch 'develop' into main

clemlesne · Jun 17, 2023 · b7e71ea · b7e71ea
2 parents 6d06a21 + 8cc17d2
commit b7e71ea
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/.github/workflows/pipeline.yaml b/.github/workflows/pipeline.yaml
@@ -23,7 +23,7 @@ env:
   # https://npmjs.com/package/@microsoft/sarif-multitool?activeTab=versions
   SARIF_MULTITOOL_VERSION: 4.2.0
   # https://npmjs.com/package/snyk?activeTab=versions
-  SNYK_VERSION: 1.1177.0
+  SNYK_VERSION: 1.1182.0
   # https://github.com/microsoft/azure-pipelines-agent/releases
   AZP_AGENT_VERSION: 3.220.5
   # https://github.com/PowerShell/PowerShell/releases
@@ -43,9 +43,9 @@ env:
   # https://github.com/stedolan/jq/releases
   JQ_VERSION: 1.6
   # https://github.com/aws/aws-cli/releases
-  AWS_CLI_VERSION: 2.11.27
+  AWS_CLI_VERSION: 2.12.1
   # https://cloud.google.com/sdk/docs/install
-  GCLOUD_CLI_VERSION: 434.0.0
+  GCLOUD_CLI_VERSION: 435.0.1
   # https://github.com/git-for-windows/git/releases
   GIT_VERSION_WIN: 2.41.0
   # https://github.com/facebook/zstd/releases
@@ -55,11 +55,11 @@ env:
   # https://nodejs.org/en/download/releases
   NODE_VERSION: 18.16.0
   # https://github.com/helm/helm/releases
-  HELM_VERSION: 3.12.0
+  HELM_VERSION: 3.12.1
   # https://github.com/oras-project/oras/releases
   ORAS_VERSION: 1.0.0
   # https://github.com/docker/buildx/releases
-  BUILDX_VERSION: 0.10.5
+  BUILDX_VERSION: 0.11.0
   # https://github.com/hadolint/hadolint/releases
   HADOLINT_VERSION: 2.12.0
 
@@ -562,7 +562,9 @@ jobs:
           docker build @params src\docker
 
           Write-Host "Pushing..."
-          docker push --quiet --all-tags ${{ env.CONTAINER_REGISTRY_GHCR }}/${{ env.CONTAINER_NAME }}
+          foreach ($tag in $tags) {
+            docker push --quiet $tag
+          }
 
       - name: Run SAST Snyk on container image
         # Snyk can be used to break the build when it detects security issues. In this case we want to upload the issues to GitHub Security

diff --git a/src/docker/Dockerfile-bookworm b/src/docker/Dockerfile-bookworm
@@ -18,7 +18,7 @@ ENV PIP_BREAK_SYSTEM_PACKAGES 1
 # - zsh, for inter-operability
 # - dbus-user-session, fuse-overlayfs, iptables, for BuildKit
 # - gzip, make, tar, unzip, wget, yq, zip, zstd for developer ease-of-life
-# - Azure CLI system requirements (Python 3.9, plus C/Rust build tools for libs non pre-built on this platform)
+# - Azure CLI system requirements (Python 3.11, plus C/Rust build tools for libs non pre-built on this platform)
 RUN rm -f /etc/apt/apt.conf.d/docker-clean \
     && echo 'Binary::apt::APT::Keep-Downloaded-Packages "true";' > /etc/apt/apt.conf.d/keep-cache
 ARG JQ_VERSION