From d8d3bf6aa8db343c7ad9e95201d8d5823759507c Mon Sep 17 00:00:00 2001 From: Gaelle Fournier Date: Mon, 12 Jun 2023 16:05:33 +0200 Subject: [PATCH] fix(build): short repo name for default baseImage --- docs/modules/ROOT/pages/pipeline/pipeline.adoc | 4 ++-- pkg/util/defaults/defaults.go | 2 +- script/Makefile | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/modules/ROOT/pages/pipeline/pipeline.adoc b/docs/modules/ROOT/pages/pipeline/pipeline.adoc index d58e5c8efb..27b83775cc 100644 --- a/docs/modules/ROOT/pages/pipeline/pipeline.adoc +++ b/docs/modules/ROOT/pages/pipeline/pipeline.adoc @@ -47,8 +47,8 @@ Altough the main goal of this custom task execution is to have a success/failure lastUpdateTime: "2023-05-19T09:56:02Z" message: | ... - {"level":"info","ts":1684490148.080175,"logger":"camel-k.builder","msg":"base image: docker.io/eclipse-temurin:11"} - {"level":"info","ts":1684490148.0801787,"logger":"camel-k.builder","msg":"resolved base image: docker.io/eclipse-temurin:11"} + {"level":"info","ts":1684490148.080175,"logger":"camel-k.builder","msg":"base image: eclipse-temurin:11"} + {"level":"info","ts":1684490148.0801787,"logger":"camel-k.builder","msg":"resolved base image: eclipse-temurin:11"} reason: Completed (0) status: "True" type: Container builder succeeded diff --git a/pkg/util/defaults/defaults.go b/pkg/util/defaults/defaults.go index 08f99b1fa5..0341b7afa2 100644 --- a/pkg/util/defaults/defaults.go +++ b/pkg/util/defaults/defaults.go @@ -35,7 +35,7 @@ const ( KanikoVersion = "1.9.1" // baseImage -- - baseImage = "docker.io/eclipse-temurin:11" + baseImage = "eclipse-temurin:11" // LocalRepository -- LocalRepository = "/etc/maven/m2" diff --git a/script/Makefile b/script/Makefile index 257d2af0f8..bb14c8691e 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 := docker.io/eclipse-temurin:11 +BASE_IMAGE := eclipse-temurin:11 DEFAULT_PVC := camel-k-pvc LOCAL_REPOSITORY := /etc/maven/m2 IMAGE_NAME ?= docker.io/apache/camel-k