Skip to content

Commit

Permalink
Merge branch 'release/17.0.11.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
pascalberger committed May 3, 2024
2 parents b7d1c01 + eb61538 commit e0c1cc2
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# These owners will be the default owners for everything in the repo and
# will be requested for review when someone opens a pull request.
* @swissgrc/platform
* @swissgrc/dev-infra
4 changes: 2 additions & 2 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ jobs:
uses: swissgrc/.github/.github/workflows/publish-image.yml@main
with:
image-name: swissgrc/azure-pipelines-openjdk
default-latest-tag: true
default-latest-tag: false
additional-latest-tag-name: 17
default-unstable-tag: true
default-unstable-tag: false
additional-unstable-tag-name: 17-unstable
secrets:
gh-token: ${{ secrets.GITHUB_TOKEN }}
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Base image containing dependencies used in builder and final image
FROM ghcr.io/swissgrc/azure-pipelines-dockercli:25.0.3 AS base
FROM ghcr.io/swissgrc/azure-pipelines-dockercli:26.1.1 AS base

# Make sure to fail due to an error at any stage in shell pipes
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
Expand Down Expand Up @@ -44,7 +44,7 @@ COPY --from=build /etc/apt/sources.list.d/ /etc/apt/sources.list.d
# Install OpenJDK

# renovate: datasource=adoptium-java depName=java-jdk versioning=loose
ENV OPENJDK_VERSION=17.0.10.0.0+7
ENV OPENJDK_VERSION=17.0.11.0.0+9

# Install OpenJDK
RUN apt-get update -y && \
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ The following example shows the container used for a deployment step which shows
- stage: deploy
jobs:
- deployment: runJava
container: swissgrc/azure-pipelines-openjdk:latest
container: swissgrc/azure-pipelines-openjdk:17
environment: smarthotel-dev
strategy:
runOnce:
Expand All @@ -35,9 +35,8 @@ The following example shows the container used for a deployment step which shows
| Tag | Description | Base Image | OpenJDK | Size |
|-------------|-----------------------------------------------------------------------------------------------|----------------------------------|-----------|-------------------------------------------------------------------------------------------------------------------------------------|
| latest | Latest stable release (from `main` branch) | azure-pipelines-dockercli:24.0.7 | 17.0.9.0 | ![Docker Image Size (tag)](https://img.shields.io/docker/image-size/swissgrc/azure-pipelines-openjdk/latest?style=flat-square) |
| unstable | Latest unstable release (from `develop` branch) | azure-pipelines-dockercli:25.0.3 | 17.0.10.0 | ![Docker Image Size (tag)](https://img.shields.io/docker/image-size/swissgrc/azure-pipelines-openjdk/unstable?style=flat-square) |
| 17-unstable | Identical to `unstable` tag | | | ![Docker Image Size (tag)](https://img.shields.io/docker/image-size/swissgrc/azure-pipelines-openjdk/17-unstable?style=flat-square) |
| 17 | Latest stable release (from `main` branch) | azure-pipelines-dockercli:26.1.1 | 17.0.11.0 | ![Docker Image Size (tag)](https://img.shields.io/docker/image-size/swissgrc/azure-pipelines-openjdk/17?style=flat-square) |
| 17-unstable | Latest unstable release (from `develop` branch) | azure-pipelines-dockercli:26.1.1 | 17.0.11.0 | ![Docker Image Size (tag)](https://img.shields.io/docker/image-size/swissgrc/azure-pipelines-openjdk/17-unstable?style=flat-square) |
| 17.0.4.0 | [OpenJDK 17.0.4](https://foojay.io/java-17/?tab=component&version=17.0.4&quarter=072022) | debian:11.3-slim | 17.0.4.0 | ![Docker Image Size (tag)](https://img.shields.io/docker/image-size/swissgrc/azure-pipelines-openjdk/17.0.4.0?style=flat-square) |
| 17.0.4.1 | [OpenJDK 17.0.4](https://foojay.io/java-17/?tab=component&version=17.0.4&quarter=072022) | debian:11.5-slim | 17.0.4.1 | ![Docker Image Size (tag)](https://img.shields.io/docker/image-size/swissgrc/azure-pipelines-openjdk/17.0.4.1?style=flat-square) |
| 17.0.5.0 | [OpenJDK 17.0.5](https://foojay.io/java-17/?tab=component&version=17.0.5&quarter=102022) | debian:11.6-slim | 17.0.5.0 | ![Docker Image Size (tag)](https://img.shields.io/docker/image-size/swissgrc/azure-pipelines-openjdk/17.0.5.0?style=flat-square) |
Expand All @@ -47,6 +46,7 @@ The following example shows the container used for a deployment step which shows
| 17.0.8.1 | [OpenJDK 17.0.8](https://foojay.io/java-17/?version=17.0.8&quarter=072023) | azure-pipelines-dockercli:24.0.5 | 17.0.8.1 | ![Docker Image Size (tag)](https://img.shields.io/docker/image-size/swissgrc/azure-pipelines-openjdk/17.0.8.1?style=flat-square) |
| 17.0.9.0 | [OpenJDK 17.0.9](https://adoptium.net/temurin/release-notes/?version=jdk-17.0.9+9) | azure-pipelines-dockercli:24.0.7 | 17.0.9.0 | ![Docker Image Size (tag)](https://img.shields.io/docker/image-size/swissgrc/azure-pipelines-openjdk/17.0.9.0?style=flat-square) |
| 17.0.10.0 | [OpenJDK 17.0.10](https://adoptium.net/temurin/release-notes/?version=jdk-17.0.10+7) | azure-pipelines-dockercli:25.0.3 | 17.0.10.0 | ![Docker Image Size (tag)](https://img.shields.io/docker/image-size/swissgrc/azure-pipelines-openjdk/17.0.10.0?style=flat-square) |
| 17.0.11.0 | [OpenJDK 17.0.11](https://adoptium.net/temurin/release-notes/?version=jdk-17.0.11+9) | azure-pipelines-dockercli:26.1.1 | 17.0.11.0 | ![Docker Image Size (tag)](https://img.shields.io/docker/image-size/swissgrc/azure-pipelines-openjdk/17.0.11.0?style=flat-square) |

### Configuration

Expand Down

0 comments on commit e0c1cc2

Please sign in to comment.