Skip to content
This repository was archived by the owner on Feb 5, 2025. It is now read-only.

Commit 18d19c2

Browse files
pascalbergerpascalberger
committed
Merge branch 'release/21.0.5.0'
2 parents 721ac93 + afb8c85 commit 18d19c2

File tree

2 files changed

+14
-8
lines changed

2 files changed

+14
-8
lines changed

‎Dockerfile

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Base image containing dependencies used in builder and final image
2-
FROM ghcr.io/swissgrc/azure-pipelines-dockercli:27.1.1 AS base
2+
FROM ghcr.io/swissgrc/azure-pipelines-dockercli:27.4.1 AS base
33

44
# Make sure to fail due to an error at any stage in shell pipes
55
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
@@ -11,19 +11,24 @@ FROM base AS build
1111
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
1212

1313
# renovate: datasource=repology depName=debian_12/curl versioning=loose
14-
ENV CURL_VERSION=7.88.1-10+deb12u6
14+
ENV CURL_VERSION=7.88.1-10+deb12u8
1515
# renovate: datasource=repology depName=debian_12/lsb-release versioning=loose
1616
ENV LSBRELEASE_VERSION=12.0-1
1717
# renovate: datasource=repology depName=debian_12/gnupg2 versioning=loose
1818
ENV GNUPG_VERSION=2.2.40-1.1
1919

2020
RUN apt-get update -y && \
2121
# Install necessary dependencies
22-
apt-get install -y --no-install-recommends curl=${CURL_VERSION} lsb-release=${LSBRELEASE_VERSION} gnupg=${GNUPG_VERSION} && \
22+
apt-get install -y --no-install-recommends \
23+
curl=${CURL_VERSION} \
24+
gnupg=${GNUPG_VERSION} \
25+
lsb-release=${LSBRELEASE_VERSION} && \
2326
# Add Eclipse Adoptium public key
24-
curl --proto "=https" -fsSL https://packages.adoptium.net/artifactory/api/gpg/key/public | tee /etc/apt/keyrings/adoptium.asc && \
27+
curl --proto "=https" -fsSL https://packages.adoptium.net/artifactory/api/gpg/key/public \
28+
| tee /etc/apt/keyrings/adoptium.asc && \
2529
# Add Eclipse Adoptium APT repository to the list of sources
26-
echo "deb [signed-by=/etc/apt/keyrings/adoptium.asc] https://packages.adoptium.net/artifactory/deb $(awk -F= '/^VERSION_CODENAME/{print$2}' /etc/os-release) main" | tee /etc/apt/sources.list.d/adoptium.list > /dev/null
30+
echo "deb [signed-by=/etc/apt/keyrings/adoptium.asc] https://packages.adoptium.net/artifactory/deb $(awk -F= '/^VERSION_CODENAME/{print$2}' /etc/os-release) main" \
31+
| tee /etc/apt/sources.list.d/adoptium.list > /dev/null
2732

2833

2934
# Final image
@@ -44,7 +49,7 @@ COPY --from=build /etc/apt/sources.list.d/ /etc/apt/sources.list.d
4449
# Install OpenJDK
4550

4651
# renovate: datasource=adoptium-java depName=java-jdk versioning=loose
47-
ENV OPENJDK_VERSION=21.0.4.0.0+7-1
52+
ENV OPENJDK_VERSION=21.0.5.0.0+11-2
4853

4954
# Install OpenJDK
5055
RUN apt-get update -y && \

‎README.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,14 @@ The following example shows the container used for a deployment step which shows
3535
3636
| Tag | Description | Base Image | OpenJDK | Size |
3737
|-------------|-----------------------------------------------------------------------------------------------|----------------------------------|-----------|-------------------------------------------------------------------------------------------------------------------------------------|
38-
| latest | Latest stable release (from `main` branch) | azure-pipelines-dockercli:27.1.1 | 21.0.4.0 | ![Docker Image Size (tag)](https://img.shields.io/docker/image-size/swissgrc/azure-pipelines-openjdk/latest?style=flat-square) |
38+
| latest | Latest stable release (from `main` branch) | azure-pipelines-dockercli:27.4.1 | 21.0.5.0 | ![Docker Image Size (tag)](https://img.shields.io/docker/image-size/swissgrc/azure-pipelines-openjdk/latest?style=flat-square) |
3939
| 21 | Identical to `latest` tag | | | ![Docker Image Size (tag)](https://img.shields.io/docker/image-size/swissgrc/azure-pipelines-openjdk/21?style=flat-square) |
40-
| unstable | Latest unstable release (from `develop` branch) | azure-pipelines-dockercli:27.1.1 | 21.0.4.0 | ![Docker Image Size (tag)](https://img.shields.io/docker/image-size/swissgrc/azure-pipelines-openjdk/unstable?style=flat-square) |
40+
| unstable | Latest unstable release (from `develop` branch) | azure-pipelines-dockercli:27.4.1 | 21.0.5.0 | ![Docker Image Size (tag)](https://img.shields.io/docker/image-size/swissgrc/azure-pipelines-openjdk/unstable?style=flat-square) |
4141
| 21-unstable | Identical to `unstable` tag | | | ![Docker Image Size (tag)](https://img.shields.io/docker/image-size/swissgrc/azure-pipelines-openjdk/21-unstable?style=flat-square) |
4242
| 21.0.2.0 | Eclipse Temurin 21.0.2 | azure-pipelines-dockercli:25.0.3 | 21.0.2.0 | ![Docker Image Size (tag)](https://img.shields.io/docker/image-size/swissgrc/azure-pipelines-openjdk/21.0.2.0?style=flat-square) |
4343
| 21.0.3.0 | Eclipse Temurin 21.0.3 | azure-pipelines-dockercli:26.1.1 | 21.0.3.0 | ![Docker Image Size (tag)](https://img.shields.io/docker/image-size/swissgrc/azure-pipelines-openjdk/21.0.3.0?style=flat-square) |
4444
| 21.0.4.0 | Eclipse Temurin 21.0.4 | azure-pipelines-dockercli:27.1.1 | 21.0.4.0 | ![Docker Image Size (tag)](https://img.shields.io/docker/image-size/swissgrc/azure-pipelines-openjdk/21.0.4.0?style=flat-square) |
45+
| 21.0.5.0 | Eclipse Temurin 21.0.5 | azure-pipelines-dockercli:27.4.1 | 21.0.5.0 | ![Docker Image Size (tag)](https://img.shields.io/docker/image-size/swissgrc/azure-pipelines-openjdk/21.0.5.0?style=flat-square) |
4546

4647
[Eclipse Temurin OpenJDK]: https://adoptium.net/temurin/
4748
[Azure Pipelines container jobs]: https://docs.microsoft.com/en-us/azure/devops/pipelines/process/container-phases

0 commit comments

Comments
 (0)