Skip to content

Commit 38cc87e

Browse files
authored
chore: use udi9 as the default development image instead of udi8 (#1995)
* fix: Update docker-run.sh's golang version Add --break-system-packages flag to pip install for container build Signed-off-by: Martin Szuc <mszuc@redhat.com> * chore: Update default image ubi8 to ubi9-latest Signed-off-by: Martin Szuc <mszuc@redhat.com> --------- Signed-off-by: Martin Szuc <mszuc@redhat.com>
1 parent d757d95 commit 38cc87e

File tree

8 files changed

+12
-11
lines changed

8 files changed

+12
-11
lines changed

build/scripts/docker-run.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,9 @@ init() {
2929
build() {
3030
printf "%bBuilding image %b${IMAGE_NAME}${NC}..." "${BOLD}" "${BLUE}"
3131
if docker build -t ${IMAGE_NAME} > docker-build-log 2>&1 -<<EOF
32-
FROM golang:1.19.13-bullseye
33-
RUN apt update && apt install python3-pip skopeo jq rsync unzip -y && pip install yq && \
32+
FROM golang:1.23-bookworm
33+
RUN apt update && apt install python3-pip skopeo jq rsync unzip -y && \
34+
pip install --break-system-packages yq && \
3435
curl -LO "https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/amd64/kubectl" && \
3536
install -o root -g root -m 0755 kubectl /usr/local/bin/kubectl && \
3637
go install golang.org/x/tools/cmd/goimports@latest && \

bundle/next/eclipse-che/manifests/che-operator.clusterserviceversion.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ metadata:
108108
operatorframework.io/arch.amd64: supported
109109
operatorframework.io/arch.arm64: supported
110110
operatorframework.io/os.linux: supported
111-
name: eclipse-che.v7.102.0-905.next
111+
name: eclipse-che.v7.103.0-906.next
112112
namespace: placeholder
113113
spec:
114114
apiservicedefinitions: {}
@@ -955,7 +955,7 @@ spec:
955955
value: che-incubator/che-code/latest
956956
- name: CHE_DEFAULT_SPEC_DEVENVIRONMENTS_DEFAULTCOMPONENTS
957957
value: '[{"name": "universal-developer-image", "container":
958-
{"image": "quay.io/devfile/universal-developer-image:ubi8-latest"}}]'
958+
{"image": "quay.io/devfile/universal-developer-image:ubi9-latest"}}]'
959959
- name: CHE_DEFAULT_SPEC_COMPONENTS_PLUGINREGISTRY_OPENVSXURL
960960
value: https://open-vsx.org
961961
- name: CHE_DEFAULT_SPEC_COMPONENTS_DEVFILEREGISTRY_EXTERNAL_DEVFILE_REGISTRIES
@@ -1080,7 +1080,7 @@ spec:
10801080
minKubeVersion: 1.19.0
10811081
provider:
10821082
name: Eclipse Foundation
1083-
version: 7.102.0-905.next
1083+
version: 7.103.0-906.next
10841084
webhookdefinitions:
10851085
- admissionReviewVersions:
10861086
- v1

config/manager/manager.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ spec:
100100
- name: CHE_DEFAULT_SPEC_DEVENVIRONMENTS_DEFAULTEDITOR
101101
value: che-incubator/che-code/latest
102102
- name: CHE_DEFAULT_SPEC_DEVENVIRONMENTS_DEFAULTCOMPONENTS
103-
value: '[{"name": "universal-developer-image", "container": {"image": "quay.io/devfile/universal-developer-image:ubi8-latest"}}]'
103+
value: '[{"name": "universal-developer-image", "container": {"image": "quay.io/devfile/universal-developer-image:ubi9-latest"}}]'
104104
- name: CHE_DEFAULT_SPEC_COMPONENTS_PLUGINREGISTRY_OPENVSXURL
105105
value: https://open-vsx.org
106106
- name: CHE_DEFAULT_SPEC_COMPONENTS_DEVFILEREGISTRY_EXTERNAL_DEVFILE_REGISTRIES

deploy/deployment/kubernetes/combined.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9181,7 +9181,7 @@ spec:
91819181
- name: CHE_DEFAULT_SPEC_DEVENVIRONMENTS_DEFAULTEDITOR
91829182
value: che-incubator/che-code/latest
91839183
- name: CHE_DEFAULT_SPEC_DEVENVIRONMENTS_DEFAULTCOMPONENTS
9184-
value: '[{"name": "universal-developer-image", "container": {"image": "quay.io/devfile/universal-developer-image:ubi8-latest"}}]'
9184+
value: '[{"name": "universal-developer-image", "container": {"image": "quay.io/devfile/universal-developer-image:ubi9-latest"}}]'
91859185
- name: CHE_DEFAULT_SPEC_COMPONENTS_PLUGINREGISTRY_OPENVSXURL
91869186
value: https://open-vsx.org
91879187
- name: CHE_DEFAULT_SPEC_COMPONENTS_DEVFILEREGISTRY_EXTERNAL_DEVFILE_REGISTRIES

deploy/deployment/kubernetes/objects/che-operator.Deployment.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ spec:
9494
- name: CHE_DEFAULT_SPEC_DEVENVIRONMENTS_DEFAULTEDITOR
9595
value: che-incubator/che-code/latest
9696
- name: CHE_DEFAULT_SPEC_DEVENVIRONMENTS_DEFAULTCOMPONENTS
97-
value: '[{"name": "universal-developer-image", "container": {"image": "quay.io/devfile/universal-developer-image:ubi8-latest"}}]'
97+
value: '[{"name": "universal-developer-image", "container": {"image": "quay.io/devfile/universal-developer-image:ubi9-latest"}}]'
9898
- name: CHE_DEFAULT_SPEC_COMPONENTS_PLUGINREGISTRY_OPENVSXURL
9999
value: https://open-vsx.org
100100
- name: CHE_DEFAULT_SPEC_COMPONENTS_DEVFILEREGISTRY_EXTERNAL_DEVFILE_REGISTRIES

deploy/deployment/openshift/combined.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9183,7 +9183,7 @@ spec:
91839183
- name: CHE_DEFAULT_SPEC_DEVENVIRONMENTS_DEFAULTEDITOR
91849184
value: che-incubator/che-code/latest
91859185
- name: CHE_DEFAULT_SPEC_DEVENVIRONMENTS_DEFAULTCOMPONENTS
9186-
value: '[{"name": "universal-developer-image", "container": {"image": "quay.io/devfile/universal-developer-image:ubi8-latest"}}]'
9186+
value: '[{"name": "universal-developer-image", "container": {"image": "quay.io/devfile/universal-developer-image:ubi9-latest"}}]'
91879187
- name: CHE_DEFAULT_SPEC_COMPONENTS_PLUGINREGISTRY_OPENVSXURL
91889188
value: https://open-vsx.org
91899189
- name: CHE_DEFAULT_SPEC_COMPONENTS_DEVFILEREGISTRY_EXTERNAL_DEVFILE_REGISTRIES

deploy/deployment/openshift/objects/che-operator.Deployment.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ spec:
9494
- name: CHE_DEFAULT_SPEC_DEVENVIRONMENTS_DEFAULTEDITOR
9595
value: che-incubator/che-code/latest
9696
- name: CHE_DEFAULT_SPEC_DEVENVIRONMENTS_DEFAULTCOMPONENTS
97-
value: '[{"name": "universal-developer-image", "container": {"image": "quay.io/devfile/universal-developer-image:ubi8-latest"}}]'
97+
value: '[{"name": "universal-developer-image", "container": {"image": "quay.io/devfile/universal-developer-image:ubi9-latest"}}]'
9898
- name: CHE_DEFAULT_SPEC_COMPONENTS_PLUGINREGISTRY_OPENVSXURL
9999
value: https://open-vsx.org
100100
- name: CHE_DEFAULT_SPEC_COMPONENTS_DEVFILEREGISTRY_EXTERNAL_DEVFILE_REGISTRIES

helmcharts/next/templates/che-operator.Deployment.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ spec:
9494
- name: CHE_DEFAULT_SPEC_DEVENVIRONMENTS_DEFAULTEDITOR
9595
value: che-incubator/che-code/latest
9696
- name: CHE_DEFAULT_SPEC_DEVENVIRONMENTS_DEFAULTCOMPONENTS
97-
value: '[{"name": "universal-developer-image", "container": {"image": "quay.io/devfile/universal-developer-image:ubi8-latest"}}]'
97+
value: '[{"name": "universal-developer-image", "container": {"image": "quay.io/devfile/universal-developer-image:ubi9-latest"}}]'
9898
- name: CHE_DEFAULT_SPEC_COMPONENTS_PLUGINREGISTRY_OPENVSXURL
9999
value: https://open-vsx.org
100100
- name: CHE_DEFAULT_SPEC_COMPONENTS_DEVFILEREGISTRY_EXTERNAL_DEVFILE_REGISTRIES

0 commit comments

Comments
 (0)