From cad80f00a4c75e0beee10b92e830c5b33458743f Mon Sep 17 00:00:00 2001
From: Anatolii Bazko <abazko@redhat.com>
Date: Fri, 25 Sep 2026 11:42:01 +0200
Subject: [PATCH] chore: use universal developer image in devfile

Replace the custom `quay.io/eclipse/che-operator-dev:latest` tooling
image with `quay.io/devfile/universal-developer-image:ubi9-latest` and
drop the now unused `.devfile.Dockerfile` along with the GitHub workflow
that built and published it.

Assisted-by: Claude Opus 5
Signed-off-by: Anatolii Bazko <abazko@redhat.com>
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
---
 .devfile.Dockerfile               | 17 -----------
 .github/workflows/devfile-ci.yaml | 49 -------------------------------
 devfile.yaml                      |  2 +-
 3 files changed, 1 insertion(+), 67 deletions(-)
 delete mode 100644 .devfile.Dockerfile
 delete mode 100644 .github/workflows/devfile-ci.yaml

diff --git a/.devfile.Dockerfile b/.devfile.Dockerfile
deleted file mode 100644
index 3c1f6acabc..0000000000
--- a/.devfile.Dockerfile
+++ /dev/null
@@ -1,17 +0,0 @@
-FROM quay.io/devfile/universal-developer-image:ubi8-latest
-
-ENV GO_VERSION=1.26.5
-RUN cd /tmp && wget https://go.dev/dl/go${GO_VERSION}.linux-amd64.tar.gz && \
-        mkdir $HOME/go${GO_VERSION} && \
-        tar -xvzf go${GO_VERSION}.linux-amd64.tar.gz -C $HOME/go${GO_VERSION} --strip-components 1 && \
-        if ! grep -q "export PATH=\$HOME/go${GO_VERSION}/bin:\$PATH" $HOME/.bashrc; then echo "export PATH=\$HOME/go${GO_VERSION}/bin:\$PATH" >> $HOME/.bashrc; fi
-
-# install chectl
-RUN tag=$(curl https://api.github.com/repos/che-incubator/chectl/tags | jq -r '.[0].name') && \
-        cd /tmp && wget https://github.com/che-incubator/chectl/releases/download/${tag}/chectl-linux-x64.tar.gz && \
-        mkdir $HOME/chectl && \
-        tar -xvzf chectl-linux-x64.tar.gz -C $HOME/chectl --strip-components 1 && \
-        if ! grep -q "export PATH=\$HOME/chectl/bin:\$PATH" $HOME/.bashrc; then echo "export PATH=\$HOME/chectl/bin:\$PATH" >> $HOME/.bashrc; fi
-
-# install goimports
-RUN $HOME/go${GO_VERSION}/bin/go install golang.org/x/tools/cmd/goimports@latest
diff --git a/.github/workflows/devfile-ci.yaml b/.github/workflows/devfile-ci.yaml
deleted file mode 100644
index 5223cda56a..0000000000
--- a/.github/workflows/devfile-ci.yaml
+++ /dev/null
@@ -1,49 +0,0 @@
-#
-# Copyright (c) 2019-2023 Red Hat, Inc.
-# This program and the accompanying materials are made
-# available under the terms of the Eclipse Public License 2.0
-# which is available at https://www.eclipse.org/legal/epl-2.0/
-#
-# SPDX-License-Identifier: EPL-2.0
-#
-# Contributors:
-#   Red Hat, Inc. - initial API and implementation
-#
-
-name: ci
-
-on:
-  push:
-    branches:
-      - 'main'
-    paths:
-      - '.devfile.Dockerfile'
-
-jobs:
-  docker:
-    runs-on: ubuntu-latest
-    steps:
-      -
-        name: Checkout
-        uses: actions/checkout@v4
-      -
-        name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-      -
-        name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-      -
-        name: Login to quay.io
-        uses: docker/login-action@v3
-        with:
-          registry: quay.io
-          username: ${{ secrets.QUAY_USERNAME }}
-          password: ${{ secrets.QUAY_PASSWORD }}
-      -
-        name: Build and push container
-        uses: docker/build-push-action@v6
-        with:
-          context: .
-          file: .devfile.Dockerfile
-          push: true
-          tags: quay.io/eclipse/che-operator-dev:latest
diff --git a/devfile.yaml b/devfile.yaml
index 4454135236..766647c79b 100644
--- a/devfile.yaml
+++ b/devfile.yaml
@@ -17,7 +17,7 @@ metadata:
 components:
   - name: tooling-container
     container:
-      image: quay.io/eclipse/che-operator-dev:latest
+      image: quay.io/devfile/universal-developer-image:ubi9-latest
       memoryRequest: 2Gi
       memoryLimit: 16Gi
       cpuRequest: 2000m