From 818ace4f1c7bfc1c06fa5a09d58bba2bfc8fc253 Mon Sep 17 00:00:00 2001 From: Artem Zatsarynnyi Date: Thu, 26 Sep 2024 14:58:05 +0200 Subject: [PATCH] Adapt to upstream: download IDE on a workspace start Signed-off-by: Artem Zatsarynnyi --- .../build/dockerfiles/brew.Dockerfile | 6 +++--- .../build/scripts/sync.sh | 0 .../container.yaml | 4 ++-- .../get-sources.sh | 0 devspaces-operator-bundle/container.yaml | 2 +- devspaces-pluginregistry/job-config.json | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) rename {devspaces-jb-remote-dev-server => devspaces-jb-ide}/build/dockerfiles/brew.Dockerfile (90%) rename {devspaces-jb-remote-dev-server => devspaces-jb-ide}/build/scripts/sync.sh (100%) rename {devspaces-jb-remote-dev-server => devspaces-jb-ide}/container.yaml (84%) rename {devspaces-jb-remote-dev-server => devspaces-jb-ide}/get-sources.sh (100%) diff --git a/devspaces-jb-remote-dev-server/build/dockerfiles/brew.Dockerfile b/devspaces-jb-ide/build/dockerfiles/brew.Dockerfile similarity index 90% rename from devspaces-jb-remote-dev-server/build/dockerfiles/brew.Dockerfile rename to devspaces-jb-ide/build/dockerfiles/brew.Dockerfile index f945645062..e0b91f4ca6 100755 --- a/devspaces-jb-remote-dev-server/build/dockerfiles/brew.Dockerfile +++ b/devspaces-jb-ide/build/dockerfiles/brew.Dockerfile @@ -15,13 +15,13 @@ FROM registry.access.redhat.com/ubi8/nodejs-20:1-50.1720405266 USER 0 -WORKDIR $REMOTE_SOURCES_DIR/devspaces-images-jb-remote-dev-server/app/devspaces-jb-remote-dev-server/ +WORKDIR $REMOTE_SOURCES_DIR/devspaces-images-jb-ide/app/devspaces-jb-ide/ # cachito:yarn step 1: copy cachito sources where we can use them; source env vars; set working dir COPY $REMOTE_SOURCES $REMOTE_SOURCES_DIR # hadolint ignore=SC2086 -RUN source $REMOTE_SOURCES_DIR/devspaces-images-jb-remote-dev-server/cachito.env +RUN source $REMOTE_SOURCES_DIR/devspaces-images-jb-ide/cachito.env RUN cp -r build/dockerfiles/*.sh / RUN cp -r status-app /status-app/ @@ -48,7 +48,7 @@ ENTRYPOINT /entrypoint.sh ENV SUMMARY="Red Hat OpenShift Dev Spaces with JetBrains IDE container" \ DESCRIPTION="Red Hat OpenShift Dev Spaces with JetBrains IDE container" \ PRODNAME="devspaces" \ - COMPNAME="jbIDE-rhel8" + COMPNAME="jb-ide-rhel8" LABEL summary="$SUMMARY" \ description="$DESCRIPTION" \ io.k8s.description="$DESCRIPTION" \ diff --git a/devspaces-jb-remote-dev-server/build/scripts/sync.sh b/devspaces-jb-ide/build/scripts/sync.sh similarity index 100% rename from devspaces-jb-remote-dev-server/build/scripts/sync.sh rename to devspaces-jb-ide/build/scripts/sync.sh diff --git a/devspaces-jb-remote-dev-server/container.yaml b/devspaces-jb-ide/container.yaml similarity index 84% rename from devspaces-jb-remote-dev-server/container.yaml rename to devspaces-jb-ide/container.yaml index d93d0af18c..76e03ec279 100644 --- a/devspaces-jb-remote-dev-server/container.yaml +++ b/devspaces-jb-ide/container.yaml @@ -16,11 +16,11 @@ compose: image_build_method: imagebuilder remote_sources: -- name: devspaces-images-jb-remote-dev-server +- name: devspaces-images-jb-ide remote_source: repo: https://github.com/redhat-developer/devspaces-images.git ref: b8d76a3091d9fbf553184bd0a3d8b797a76e38dd pkg_managers: [npm] packages: npm: - - path: devspaces-jb-remote-dev-server/status-app/ + - path: devspaces-jb-ide/status-app/ diff --git a/devspaces-jb-remote-dev-server/get-sources.sh b/devspaces-jb-ide/get-sources.sh similarity index 100% rename from devspaces-jb-remote-dev-server/get-sources.sh rename to devspaces-jb-ide/get-sources.sh diff --git a/devspaces-operator-bundle/container.yaml b/devspaces-operator-bundle/container.yaml index 5f188f1f45..1df0158e42 100644 --- a/devspaces-operator-bundle/container.yaml +++ b/devspaces-operator-bundle/container.yaml @@ -44,7 +44,7 @@ operator_manifests: devspaces-dashboard-rhel8-container: devspaces/dashboard-rhel8 devspaces-devfileregistry-rhel8-container: devspaces/devfileregistry-rhel8 devspaces-idea-rhel8-container: devspaces/idea-rhel8 - devspaces-idea-remote-dev-server-rhel8-container: devspaces/idea-remote-dev-server-rhel8 + devspaces-jb-ide-rhel8-container: devspaces/jb-ide-rhel8 devspaces-imagepuller-rhel8-container: devspaces/imagepuller-rhel8 devspaces-machineexec-rhel8-container: devspaces/machineexec-rhel8 devspaces-pluginregistry-rhel8-container: devspaces/pluginregistry-rhel8 diff --git a/devspaces-pluginregistry/job-config.json b/devspaces-pluginregistry/job-config.json index 3f381365e2..5f9438a48b 100644 --- a/devspaces-pluginregistry/job-config.json +++ b/devspaces-pluginregistry/job-config.json @@ -302,7 +302,7 @@ "disabled": false } }, - "idea-server": { + "jb-ide": { "3.11": { "upstream_branch": [ "main",