don't need to generate editors using npm

Signed-off-by: Valeriy Svydenko <[email protected]>

Author: svor

dependencies/che-plugin-registry/.htaccess

@@ -227,12 +227,6 @@ else
     jobconfigjson=/tmp/job-config.json
 fi
 REGISTRY_VERSION=$(jq -r '.Version' "${jobconfigjson}");
-REGISTRY_GENERATOR_VERSION=$(jq -r --arg REGISTRY_VERSION "${REGISTRY_VERSION}" '.Other["@eclipse-che/plugin-registry-generator"][$REGISTRY_VERSION]' "${jobconfigjson}");
-# echo "REGISTRY_VERSION=${REGISTRY_VERSION}; REGISTRY_GENERATOR_VERSION=${REGISTRY_GENERATOR_VERSION}"
-
-echo "Generate artifacts"
-# do not generate digests as they'll be added at runtime from the operator (see CRW-1157)
-npx @eclipse-che/plugin-registry-generator@"${REGISTRY_GENERATOR_VERSION}" --root-folder:"$(pwd)" --output-folder:"$(pwd)/output" "${BUILD_FLAGS_ARRAY[@]}" --skip-digest-generation:true
 
 if [ "${SKIP_OCI_IMAGE}" != "true" ]; then
     detectBuilder
@@ -244,15 +238,14 @@ if [ "${SKIP_OCI_IMAGE}" != "true" ]; then
     # TODO migrate this to cachito - https://issues.redhat.com/browse/CRW-3336
     prepareOVSXPackagingAsset
     prepareOpenvsxPackagingAsset
-    # Tar up the outputted files as the Dockerfile depends on them
-    tar -czvf resources.tgz ./output/v3/
+
     echo "Build with $BUILDER $BUILD_COMMAND"
     IMAGE="${REGISTRY}/${ORGANIZATION}/pluginregistry-rhel8:${TAG}"
     # Copy to root directory to behave as if in Brew or devspaces-images
     cp "${DOCKERFILE}" ./builder.Dockerfile
     ${BUILDER} ${BUILD_COMMAND} --progress=plain -t "${IMAGE}" -f ./builder.Dockerfile .
     # Remove copied Dockerfile and tarred zip
-    rm ./builder.Dockerfile resources.tgz openvsx-server.tar.gz ovsx.tar.gz
+    rm ./builder.Dockerfile openvsx-server.tar.gz ovsx.tar.gz
     # remove unneeded images from container registry
     cleanupImages
 fi

dependencies/che-plugin-registry/build.sh

@@ -54,6 +54,8 @@ RUN mkdir -p /tmp/opt
 COPY --chown=0:0 /ovsx.tar.gz .
 RUN tar -xf ovsx.tar.gz -C / && rm ovsx.tar.gz && ls -la /tmp/opt/ovsx/bin/
 
+RUN mkdir -p /var/www/html/v3/plugins/
+
 RUN \
     # Apply permissions to later change these files on httpd
     chmod g+rwx /var/log/httpd && chmod g+rw /run/httpd && \
@@ -69,22 +71,14 @@ RUN \
 COPY /build/scripts/import_vsix.sh /usr/local/bin
 COPY /build/scripts/start_services.sh /usr/local/bin/
 COPY /build/dockerfiles/openvsx.conf /etc/httpd/conf.d/
-COPY README.md .htaccess /var/www/html/
-COPY /build/scripts/*.sh resources.tgz che-*.yaml /build/
+COPY /build/scripts/*.sh /build/
 
 RUN chmod 755 /usr/local/bin/*.sh && \
-    tar --no-same-owner -xvf /build/resources.tgz -C /build/ && \
-    rm -rf /build/output/v3/che-editors.yaml && \
-    chmod -R g+rwX /build && \
-    cp -r /build/output/v3 /var/www/html/
+    chmod -R g+rwX /build
 
-COPY v3/plugins/ /var/www/html/v3/plugins/
-COPY v3/images/*.* /var/www/html/v3/images/
 COPY /build/dockerfiles/entrypoint.sh /usr/local/bin/
 
 RUN \
-    # Apply permissions to later change these files (entrypoint update_extension_vsx_references)
-    chmod g+rwx -R /var/www/html/v3 && \
     # Delete files that should not be copied into the final image
     rm -rf /build
 

dependencies/che-plugin-registry/build/dockerfiles/Dockerfile

@@ -57,6 +57,8 @@ RUN mkdir -p /tmp/opt
 COPY --chown=0:0 /ovsx.tar.gz .
 RUN tar -xf ovsx.tar.gz -C / && rm ovsx.tar.gz && ls -la /tmp/opt/ovsx/bin/
 
+RUN mkdir -p /var/www/html/v3/plugins/
+
 RUN \
     # Apply permissions to later change these files on httpd
     chmod g+rwx /var/log/httpd && chmod g+rw /run/httpd && \
@@ -72,22 +74,14 @@ RUN \
 COPY /build/scripts/import_vsix.sh /usr/local/bin
 COPY /build/scripts/start_services.sh /usr/local/bin/
 COPY /build/dockerfiles/openvsx.conf /etc/httpd/conf.d/
-COPY README.md .htaccess /var/www/html/
-COPY /build/scripts/*.sh resources.tgz che-*.yaml /build/
+COPY /build/scripts/*.sh /build/
 
 RUN chmod 755 /usr/local/bin/*.sh && \
-    tar --no-same-owner -xvf /build/resources.tgz -C /build/ && \
-    rm -rf /build/output/v3/che-editors.yaml && \
-    chmod -R g+rwX /build && \
-    cp -r /build/output/v3 /var/www/html/
+    chmod -R g+rwX /build
 
-COPY v3/plugins/ /var/www/html/v3/plugins/
-COPY v3/images/*.* /var/www/html/v3/images/
 COPY /build/dockerfiles/entrypoint.sh /usr/local/bin/
 
 RUN \
-    # Apply permissions to later change these files (entrypoint update_extension_vsx_references)
-    chmod g+rwx -R /var/www/html/v3 && \
     # Delete files that should not be copied into the final image
     rm -rf /build