Adapt to upstream: download IDE on a workspace start

Signed-off-by: Artem Zatsarynnyi <[email protected]>
redhat-developer · Sep 26, 2024 · 818ace4 · 818ace4
1 parent 21b5aa4
commit 818ace4
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git a/...-server/build/dockerfiles/brew.Dockerfile → ...-jb-ide/build/dockerfiles/brew.Dockerfile b/...-server/build/dockerfiles/brew.Dockerfile → ...-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/...b-remote-dev-server/build/scripts/sync.sh → devspaces-jb-ide/build/scripts/sync.sh b/...b-remote-dev-server/build/scripts/sync.sh → devspaces-jb-ide/build/scripts/sync.sh
diff --git a/...paces-jb-remote-dev-server/container.yaml → devspaces-jb-ide/container.yaml b/...paces-jb-remote-dev-server/container.yaml → 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/...paces-jb-remote-dev-server/get-sources.sh → devspaces-jb-ide/get-sources.sh b/...paces-jb-remote-dev-server/get-sources.sh → devspaces-jb-ide/get-sources.sh
diff --git 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
@@ -302,7 +302,7 @@
         "disabled": false
       }
     },
-    "idea-server": {
+    "jb-ide": {
       "3.11": {
         "upstream_branch": [
           "main",