From 6a78e9ef39b2cb201fbd1c039bcbfc69777721d1 Mon Sep 17 00:00:00 2001 From: Shawn Thompson Date: Wed, 13 Nov 2024 07:46:52 -0500 Subject: [PATCH] fix: github actions and Jenkinsfile build --- .github/workflows/docker-cd.yml | 8 ++++---- CONTRIBUTING.adoc | 4 ++-- packaging-slim-parent-pom/README.adoc | 2 +- packaging/docker/README.adoc | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/docker-cd.yml b/.github/workflows/docker-cd.yml index 1794b703..df465ab4 100644 --- a/.github/workflows/docker-cd.yml +++ b/.github/workflows/docker-cd.yml @@ -32,11 +32,11 @@ jobs: fail-fast: false matrix: include: - - alias: jre-11 - dockerfile: packaging/docker/unix/eclipse-temurin-11-jre/Dockerfile + - alias: jre-17 + dockerfile: packaging/docker/unix/eclipse-temurin-17-jre/Dockerfile tags: test - - alias: jre-11-alpine - dockerfile: packaging/docker/unix/eclipse-temurin-11-jre-alpine/Dockerfile + - alias: jre-17-alpine + dockerfile: packaging/docker/unix/eclipse-temurin-17-jre-alpine/Dockerfile tags: test-alpine name: "Build Docker image: ${{ matrix.alias }}" diff --git a/CONTRIBUTING.adoc b/CONTRIBUTING.adoc index e1ae0d8b..201dbb36 100644 --- a/CONTRIBUTING.adoc +++ b/CONTRIBUTING.adoc @@ -47,11 +47,11 @@ This will generate an assembly artifact through the `appassembler-maven-plugin` This repository includes the base image which can be built simply as... - docker build -t jenkins4eval/jenkinsfile-runner -f packaging/docker/unix/eclipse-temurin-11-jre/Dockerfile . + docker build -t jenkins4eval/jenkinsfile-runner -f packaging/docker/unix/eclipse-temurin-17-jre/Dockerfile . During development you can reuse the local machine build instead of doing a full build from scratch - docker build -t jenkins4eval/jenkinsfile-runner:dev -f packaging/docker/unix/eclipse-temurin-11-jre/Dockerfile-dev-vanilla . + docker build -t jenkins4eval/jenkinsfile-runner:dev -f packaging/docker/unix/eclipse-temurin-17-jre/Dockerfile-dev-vanilla . == Debugging diff --git a/packaging-slim-parent-pom/README.adoc b/packaging-slim-parent-pom/README.adoc index 772484ea..f85f0c48 100644 --- a/packaging-slim-parent-pom/README.adoc +++ b/packaging-slim-parent-pom/README.adoc @@ -17,7 +17,7 @@ The parent POM prepares the following artifacts in `target`: == Usage in Docker -See link:../packaging/docker/unix/eclipse-temurin-11-jre/Dockerfile-dev-slim[Dockerfile-dev-slim] for example. +See link:../packaging/docker/unix/eclipse-temurin-17-jre/Dockerfile-dev-slim[Dockerfile-dev-slim] for example. This example also uses additional optimization tricks. == Status diff --git a/packaging/docker/README.adoc b/packaging/docker/README.adoc index c3a52179..b754f2e6 100644 --- a/packaging/docker/README.adoc +++ b/packaging/docker/README.adoc @@ -23,7 +23,7 @@ The following format is used: ${JVM_VENDOR}-${JAVA_VERSION}[-${JVM_CLASSIFIER1}][-${JVM_CLASSIFIER2}]...[-${OS}] ---- -Examples: `eclipse-temurin-11-jre`, `eclipse-temurin-11-jre-alpine` +Examples: `eclipse-temurin-17-jre`, `eclipse-temurin-17-jre-alpine` * `JVM_VENDOR` - source of the JVM in lowercase, e.g. Eclipse Temurin. * `JAVA_VERSION` - version of the JVM.