From 21b5aa4f1de1d03d3389dd1823866bedb61705d5 Mon Sep 17 00:00:00 2001 From: Artem Zatsarynnyi Date: Tue, 24 Sep 2024 15:27:04 +0200 Subject: [PATCH] Adapt to upstream: download IDE on a workspace start Signed-off-by: Artem Zatsarynnyi --- .../fetch-artifacts-url.yaml | 4 --- .../build/dockerfiles/brew.Dockerfile | 26 +++++++++---------- .../build/scripts/sync.sh | 2 +- .../container.yaml | 4 +-- .../get-sources.sh | 0 5 files changed, 15 insertions(+), 21 deletions(-) delete mode 100644 devspaces-idea-remote-dev-server/fetch-artifacts-url.yaml rename {devspaces-idea-remote-dev-server => devspaces-jb-remote-dev-server}/build/dockerfiles/brew.Dockerfile (66%) rename {devspaces-idea-remote-dev-server => devspaces-jb-remote-dev-server}/build/scripts/sync.sh (98%) rename {devspaces-idea-remote-dev-server => devspaces-jb-remote-dev-server}/container.yaml (84%) rename {devspaces-idea-remote-dev-server => devspaces-jb-remote-dev-server}/get-sources.sh (100%) diff --git a/devspaces-idea-remote-dev-server/fetch-artifacts-url.yaml b/devspaces-idea-remote-dev-server/fetch-artifacts-url.yaml deleted file mode 100644 index 1c9d4a8b5f..0000000000 --- a/devspaces-idea-remote-dev-server/fetch-artifacts-url.yaml +++ /dev/null @@ -1,4 +0,0 @@ -- url: https://download.devel.redhat.com/rcm-guest/staging/devspaces/build-requirements/common/ideaIU/2023.2.5/ideaIU-2023.2.5.tar.gz - sha256: "1fcffaa924f60d2d74a2494ee3a69e904ae0e91b491ad373639fab61f2568624" - source-url: https://download-cdn.jetbrains.com/idea/ideaIU-2023.2.5.tar.gz - source-sha256: "1fcffaa924f60d2d74a2494ee3a69e904ae0e91b491ad373639fab61f2568624" diff --git a/devspaces-idea-remote-dev-server/build/dockerfiles/brew.Dockerfile b/devspaces-jb-remote-dev-server/build/dockerfiles/brew.Dockerfile similarity index 66% rename from devspaces-idea-remote-dev-server/build/dockerfiles/brew.Dockerfile rename to devspaces-jb-remote-dev-server/build/dockerfiles/brew.Dockerfile index 7cfef47f88..f945645062 100755 --- a/devspaces-idea-remote-dev-server/build/dockerfiles/brew.Dockerfile +++ b/devspaces-jb-remote-dev-server/build/dockerfiles/brew.Dockerfile @@ -11,35 +11,33 @@ # The Dockerfile works only in Brew, as it is customized for Cachito fetching # project sources and npm dependencies, and performing an offline build with them -# https://registry.access.redhat.com/ubi8/nodejs-18 -FROM registry.access.redhat.com/ubi8/nodejs-18:1-94 +# https://registry.access.redhat.com/ubi8/nodejs-20 +FROM registry.access.redhat.com/ubi8/nodejs-20:1-50.1720405266 USER 0 -WORKDIR $REMOTE_SOURCES_DIR/devspaces-images-idea/app/devspaces-idea-remote-dev-server/ +WORKDIR $REMOTE_SOURCES_DIR/devspaces-images-jb-remote-dev-server/app/devspaces-jb-remote-dev-server/ # 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-idea/cachito.env - -COPY artifacts/ideaIU-*.tar.gz /idea-dist/ +RUN source $REMOTE_SOURCES_DIR/devspaces-images-jb-remote-dev-server/cachito.env RUN cp -r build/dockerfiles/*.sh / -RUN cp -r status-app /idea-dist/status-app/ +RUN cp -r status-app /status-app/ -# Create a directory for mounting a volume. -RUN mkdir /idea-server +# Create a folders structure for mounting a shared volume and copy the editor binaries to. +RUN mkdir -p /idea-server/status-app # Adjust permissions on some items so they're writable by group root. # hadolint ignore=SC2086 -RUN for f in "${HOME}" "/etc/passwd" "/etc/group" "/idea-dist/status-app" "/idea-server"; do\ +RUN for f in "${HOME}" "/etc/passwd" "/etc/group" "/status-app" "/idea-server"; do\ chgrp -R 0 ${f} && \ chmod -R g+rwX ${f}; \ done # Build the status app. -WORKDIR /idea-dist/status-app/ +WORKDIR /status-app/ RUN npm install # Switch to unprivileged user. @@ -47,10 +45,10 @@ USER 1001 ENTRYPOINT /entrypoint.sh -ENV SUMMARY="Red Hat OpenShift Dev Spaces with IntelliJ IDEA Ultimate IDE container" \ - DESCRIPTION="Red Hat OpenShift Dev Spaces with IntelliJ IDEA Ultimate IDE container" \ +ENV SUMMARY="Red Hat OpenShift Dev Spaces with JetBrains IDE container" \ + DESCRIPTION="Red Hat OpenShift Dev Spaces with JetBrains IDE container" \ PRODNAME="devspaces" \ - COMPNAME="ideaIU-rhel8" + COMPNAME="jbIDE-rhel8" LABEL summary="$SUMMARY" \ description="$DESCRIPTION" \ io.k8s.description="$DESCRIPTION" \ diff --git a/devspaces-idea-remote-dev-server/build/scripts/sync.sh b/devspaces-jb-remote-dev-server/build/scripts/sync.sh similarity index 98% rename from devspaces-idea-remote-dev-server/build/scripts/sync.sh rename to devspaces-jb-remote-dev-server/build/scripts/sync.sh index 63ce1b7ccb..2b5b9f06f4 100644 --- a/devspaces-idea-remote-dev-server/build/scripts/sync.sh +++ b/devspaces-jb-remote-dev-server/build/scripts/sync.sh @@ -17,7 +17,7 @@ CSV_VERSION=3.y.0 # csv 3.y.0 DS_VERSION=${CSV_VERSION%.*} # tag 3.y UPSTM_NAME="che-idea-dev-server" -MIDSTM_NAME="idea-server" +MIDSTM_NAME="jb-remote-dev-server" usage () { echo " diff --git a/devspaces-idea-remote-dev-server/container.yaml b/devspaces-jb-remote-dev-server/container.yaml similarity index 84% rename from devspaces-idea-remote-dev-server/container.yaml rename to devspaces-jb-remote-dev-server/container.yaml index dedece1953..d93d0af18c 100644 --- a/devspaces-idea-remote-dev-server/container.yaml +++ b/devspaces-jb-remote-dev-server/container.yaml @@ -16,11 +16,11 @@ compose: image_build_method: imagebuilder remote_sources: -- name: devspaces-idea-remote-dev-server +- name: devspaces-images-jb-remote-dev-server remote_source: repo: https://github.com/redhat-developer/devspaces-images.git ref: b8d76a3091d9fbf553184bd0a3d8b797a76e38dd pkg_managers: [npm] packages: npm: - - path: devspaces-idea-remote-dev-server/status-app/ + - path: devspaces-jb-remote-dev-server/status-app/ diff --git a/devspaces-idea-remote-dev-server/get-sources.sh b/devspaces-jb-remote-dev-server/get-sources.sh similarity index 100% rename from devspaces-idea-remote-dev-server/get-sources.sh rename to devspaces-jb-remote-dev-server/get-sources.sh