You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by pc...@apache.org on 2023/07/26 12:49:42 UTC
[camel-k] 01/02: chore(ci): default JDK 17 base image
This is an automated email from the ASF dual-hosted git repository.
pcongiusti pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit aea6d7c2b728284422dbb600fd53edd3dff54891
Author: Pasquale Congiusti <pa...@gmail.com>
AuthorDate: Wed Jul 26 11:27:27 2023 +0200
chore(ci): default JDK 17 base image
---
.github/actions/kamel-prepare-env/action.yml | 4 ++--
pkg/builder/buildah.go | 2 +-
pkg/util/defaults/defaults.go | 2 +-
script/Makefile | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/.github/actions/kamel-prepare-env/action.yml b/.github/actions/kamel-prepare-env/action.yml
index dd2fbd1ef..78e169cae 100644
--- a/.github/actions/kamel-prepare-env/action.yml
+++ b/.github/actions/kamel-prepare-env/action.yml
@@ -63,11 +63,11 @@ runs:
echo "Final status:"
df -h
- - name: Set up JDK 11
+ - name: Set up JDK 17
uses: actions/setup-java@v3
if: ${{ env.ENV_PREPARED != 'true' }}
with:
- java-version: '11'
+ java-version: '17'
distribution: 'temurin'
- name: Set up Go
diff --git a/pkg/builder/buildah.go b/pkg/builder/buildah.go
index 43f9c7087..d1ca940cb 100644
--- a/pkg/builder/buildah.go
+++ b/pkg/builder/buildah.go
@@ -20,7 +20,7 @@ package builder
const BuildahPlatform = "BuildahPlatform"
const BuildahImage = "BuildahImage"
const BuildahDefaultImageName = "quay.io/buildah/stable"
-const BuildahDefaultBaseImageName = "docker.io/library/eclipse-temurin:11"
+const BuildahDefaultBaseImageName = "docker.io/library/eclipse-temurin:17"
var buildahSupportedOptions = map[string]PublishStrategyOption{
BuildahPlatform: {
diff --git a/pkg/util/defaults/defaults.go b/pkg/util/defaults/defaults.go
index 747fdcf09..728719d95 100644
--- a/pkg/util/defaults/defaults.go
+++ b/pkg/util/defaults/defaults.go
@@ -35,7 +35,7 @@ const (
KanikoVersion = "1.9.1"
// baseImage --
- baseImage = "eclipse-temurin:11"
+ baseImage = "eclipse-temurin:17"
// LocalRepository --
LocalRepository = "/etc/maven/m2"
diff --git a/script/Makefile b/script/Makefile
index d9f3b89f5..d26967e84 100644
--- a/script/Makefile
+++ b/script/Makefile
@@ -31,7 +31,7 @@ CODEGEN_VERSION := v0.25.6
OPERATOR_SDK_VERSION := v1.28.0
KUSTOMIZE_VERSION := v4.5.4
OPM_VERSION := v1.24.0
-BASE_IMAGE := eclipse-temurin:11
+BASE_IMAGE := eclipse-temurin:17
LOCAL_REPOSITORY := /etc/maven/m2
IMAGE_NAME ?= docker.io/apache/camel-k
# Default value, change to your architecture accordingly