Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore(ci): default JDK 17 base image #4610

Merged
merged 2 commits into from
Jul 26, 2023
Merged

chore(ci): default JDK 17 base image #4610

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5e0e1a1
chore(ci): default JDK 17 base image
squakez Jul 26, 2023
9040378
fix(ci): add y option
squakez Jul 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/actions/e2e-common/exec-tests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@

set -e

while getopts ":b:c:g:i:l:n:q:s:v:x:z:" opt; do
while getopts ":b:c:g:i:l:n:q:s:v:x:y:z:" opt; do
case "${opt}" in
b)
BUILD_CATALOG_SOURCE_NAME=${OPTARG}
Expand Down
4 changes: 2 additions & 2 deletions .github/actions/kamel-prepare-env/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion pkg/builder/buildah.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: {
Expand Down
2 changes: 1 addition & 1 deletion pkg/util/defaults/defaults.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ const (
KanikoVersion = "1.9.1"

// baseImage --
baseImage = "eclipse-temurin:11"
baseImage = "eclipse-temurin:17"

// LocalRepository --
LocalRepository = "/etc/maven/m2"
Expand Down
2 changes: 1 addition & 1 deletion script/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading