Merge branch 'release/20.10.0'

swissgrc · Nov 22, 2023 · 2dbc4c3 · 2dbc4c3
2 parents 392bd4b + e3f2b32
commit 2dbc4c3
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 12 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,5 +1,5 @@
 # Base image containing dependencies used in builder and final image
-FROM ghcr.io/swissgrc/azure-pipelines-dotnet:7.0.402 AS base
+FROM ghcr.io/swissgrc/azure-pipelines-dotnet:7.0.403 AS base
 
 
 # Builder image
@@ -8,10 +8,10 @@ FROM base AS build
 # Make sure to fail due to an error at any stage in shell pipes
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 
-# renovate: datasource=repology depName=debian_11/curl versioning=deb
-ENV CURL_VERSION=7.74.0-1.3+deb11u10
-# renovate: datasource=repology depName=debian_11/gnupg2 versioning=deb
-ENV GNUPG_VERSION=2.2.27-2+deb11u2
+# renovate: datasource=repology depName=debian_12/curl versioning=deb
+ENV CURL_VERSION=7.88.1-10+deb12u4
+# renovate: datasource=repology depName=debian_12/gnupg2 versioning=deb
+ENV GNUPG_VERSION=2.2.40-1.1
 
 RUN apt-get update -y && \
   # Install necessary dependencies
@@ -41,7 +41,7 @@ COPY --from=build /etc/apt/sources.list.d/ /etc/apt/sources.list.d
 # Install NodeJS
 
 # renovate: datasource=github-tags depName=nodejs/node extractVersion=^v(?<version>.*)$
-ENV NODE_VERSION=20.9.0
+ENV NODE_VERSION=20.10.0
 
 RUN apt-get update -y && \
   # Install NodeJs
@@ -50,4 +50,14 @@ RUN apt-get update -y && \
   apt-get clean && \
   rm -rf /var/lib/apt/lists/* && \
   # Smoke test
-  node -v
+  node -v
+
+# Install Yarn
+
+# renovate: datasource=github-tags depName=yarnpkg/yarn extractVersion=^v(?<version>.*)$
+ENV YARN_VERSION=1.22.21
+
+RUN npm install -g yarn@${YARN_VERSION} --ignore-scripts && \
+  npm cache clean --force && \
+  # Smoke test
+  yarn --version
diff --git a/README.md b/README.md
@@ -40,10 +40,11 @@ The following example shows the container used for a deployment step with a Azur
 
 ### Tags
 
-| Tag              | Description                                                                                       | Base Image                                | Node.js | Size                                                                                                                                  |
-|------------------|---------------------------------------------------------------------------------------------------|-------------------------------------------|---------|---------------------------------------------------------------------------------------------------------------------------------------|
-| latest-20-net7   | Identical to `latest` tag                                                                         |                                           |         | ![Docker Image Size (tag)](https://img.shields.io/docker/image-size/swissgrc/azure-pipelines-node/latest-20-net7?style=flat-square)   |
-| unstable-20-net7 | Identical to `unstable` tag                                                                       |                                           |         | ![Docker Image Size (tag)](https://img.shields.io/docker/image-size/swissgrc/azure-pipelines-node/unstable-20-net7?style=flat-square) |
-| 20.9.0-net7      | [Node.js 20.9.0](https://github.com/nodejs/node/blob/main/doc/changelogs/CHANGELOG_V20.md#20.9.0) | swissgrc/azure-pipelines-dotnet:7.0.402   | 20.9.0  | ![Docker Image Size (tag)](https://img.shields.io/docker/image-size/swissgrc/azure-pipelines-node/20.9.0-net7?style=flat-square)      |
+| Tag              | Description                                                                                         | Base Image                                | Node.js | Yarn    | Size                                                                                                                                  |
+|------------------|-----------------------------------------------------------------------------------------------------|-------------------------------------------|---------|---------|---------------------------------------------------------------------------------------------------------------------------------------|
+| latest-20-net7   | Latest stable release (from `main` branch)                                                          | swissgrc/azure-pipelines-dotnet:7.0.402   | 20.10.0 | 1.22.21 | ![Docker Image Size (tag)](https://img.shields.io/docker/image-size/swissgrc/azure-pipelines-node/latest-20-net7?style=flat-square)   |
+| unstable-20-net7 | Latest unstable release (from `develop` branch)                                                     | swissgrc/azure-pipelines-dotnet:7.0.403   | 20.10.0 | 1.22.21 | ![Docker Image Size (tag)](https://img.shields.io/docker/image-size/swissgrc/azure-pipelines-node/unstable-20-net7?style=flat-square) |
+| 20.9.0-net7      | [Node.js 20.9.0](https://github.com/nodejs/node/blob/main/doc/changelogs/CHANGELOG_V20.md#20.9.0)   | swissgrc/azure-pipelines-dotnet:7.0.402   | 20.9.0  | N/A     | ![Docker Image Size (tag)](https://img.shields.io/docker/image-size/swissgrc/azure-pipelines-node/20.9.0-net7?style=flat-square)      |
+| 20.10.0-net7     | [Node.js 20.10.0](https://github.com/nodejs/node/blob/main/doc/changelogs/CHANGELOG_V20.md#20.10.0) | swissgrc/azure-pipelines-dotnet:7.0.402   | 20.9.0  | N/A     | ![Docker Image Size (tag)](https://img.shields.io/docker/image-size/swissgrc/azure-pipelines-node/20.10.0-net7?style=flat-square)     |
 
 [Azure Pipelines container jobs]: https://docs.microsoft.com/en-us/azure/devops/pipelines/process/container-phases