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

Commit 8dbbfa1

Browse files
committed
Merge branch 'release/21.0.3.0'
2 parents ebf407c + e7e0aea commit 8dbbfa1

File tree

2 files changed

+6
-12
lines changed

2 files changed

+6
-12
lines changed

Dockerfile

Lines changed: 2 additions & 2 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:25.0.3 AS base
2+
FROM ghcr.io/swissgrc/azure-pipelines-dockercli:26.1.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"]
@@ -44,7 +44,7 @@ COPY --from=build /etc/apt/sources.list.d/ /etc/apt/sources.list.d
4444
# Install OpenJDK
4545

4646
# renovate: datasource=adoptium-java depName=java-jdk versioning=loose
47-
ENV OPENJDK_VERSION=21.0.2.0.0+13
47+
ENV OPENJDK_VERSION=21.0.3.0.0+9-1
4848

4949
# Install OpenJDK
5050
RUN apt-get update -y && \

README.md

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -35,18 +35,12 @@ 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:25.0.3 | 21.0.2.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:26.1.1 | 21.0.3.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:25.0.3 | 21.0.2.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:26.1.1 | 21.0.3.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) |
42-
43-
### Configuration
44-
45-
These environment variables are supported:
46-
47-
| Environment variable | Default value | Description |
48-
|------------------------|----------------------|------------------------------------------------------------------|
49-
| OPENJDK_VERSION | `21.0.2.0.0+13` | Version of Eclipse Temurin OpenJDK installed in the image. |
42+
| 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) |
43+
| 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) |
5044

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

0 commit comments

Comments
 (0)