Release 7.3.1 version of che-plugin-registry

.gitignore

@@ -18,3 +18,4 @@ test-output/
 .DAV
 
 che-dto.ts
+v3/**/latest/

.htaccess

@@ -2,6 +2,7 @@ Header set Access-Control-Allow-Origin "*"
 Header set Access-Control-Allow-Headers "Authorization"
 DirectoryIndex README.md
 Redirect temp /plugins /v3/plugins
+Redirect temp /resources /v3/resources
 <FilesMatch "\.(json|yaml)$">
     <IfModule mod_expires.c>
 	ExpiresActive Off

README.md

@@ -324,7 +324,7 @@ spec:
     - name: HOSTED_PLUGIN_HOSTNAME
       value: 0.0.0.0
     - name: HOSTED_PLUGIN_PORT
-      value: 3130
+      value: "3130"
     volumes:
     - mountPath: /plugins
       name: plugins

VERSION

@@ -1 +1 @@
-7.3.0
+7.3.1

build.sh

@@ -15,6 +15,7 @@ ORGANIZATION="eclipse"
 TAG="nightly"
 LATEST_ONLY=false
 OFFLINE=false
+DOCKERFILE="./build/dockerfiles/Dockerfile"
 
 USAGE="
 Usage: ./build.sh [OPTIONS]
@@ -32,6 +33,8 @@ Options:
     --offline
         Build offline version of registry, with all extension artifacts
         cached in the registry; disabled by default.
+    --rhel
+        Build using the rhel.Dockerfile instead of the default
 "
 
 function print_usage() {
@@ -62,6 +65,10 @@ function parse_arguments() {
             OFFLINE=true
             shift
             ;;
+            --rhel)
+            DOCKERFILE=./build/dockerfiles/rhel.Dockerfile
+            shift
+            ;;
             *)
             print_usage
             exit 0
@@ -77,14 +84,14 @@ if [ "$OFFLINE" = true ]; then
     echo "in offline mode"
     docker build \
         -t "$IMAGE" \
-        -f ./build/dockerfiles/Dockerfile \
+        -f "$DOCKERFILE" \
         --build-arg LATEST_ONLY="${LATEST_ONLY}" \
         --target offline-registry .
 else
     echo ""
     docker build \
         -t "$IMAGE" \
-        -f ./build/dockerfiles/Dockerfile \
+        -f "$DOCKERFILE" \
         --build-arg LATEST_ONLY="${LATEST_ONLY}" \
         --target registry .
 fi

build/dockerfiles/Dockerfile

@@ -21,14 +21,15 @@ COPY /v3 /build/v3
 WORKDIR /build/
 
 RUN if [[ ${LATEST_ONLY} == "true" ]]; then \
-      rm -fr $(find /build/v3 -name 'meta.yaml' | grep -v "/latest/" | grep -o ".*/"); \
+      ./keep_only_latest.sh; \
     fi
 
-RUN ./check_plugins_location.sh v3 && \
+RUN ./generate_latest_metas.sh v3 && \
+    ./check_plugins_location.sh v3 && \
     ./set_plugin_dates.sh v3 && \
     ./check_plugins_viewer_mandatory_fields.sh v3 && \
-    ./ensure_latest_exists.sh && \
     ./index.sh v3 > /build/v3/plugins/index.json && \
+    ./list_referenced_images.sh v3 > /build/v3/external_images.txt && \
     chmod -R g+rwX /build
 
 # Build registry, copying meta.yamls and index.json from builder

build/dockerfiles/entrypoint.sh

@@ -34,7 +34,7 @@ METAS_DIR="${METAS_DIR:-${DEFAULT_METAS_DIR}}"
 #   \4 - Image name portion of image, e.g. quay.io/eclipse/(che-theia):tag
 #   \5 - Tag of image, e.g. quay.io/eclipse/che-theia:(tag)
 #   \6 - Optional quotation following image reference
-IMAGE_REGEX='([[:space:]]*"?)([._a-zA-Z0-9-]*)/([._a-zA-Z0-9-]*)/([._a-zA-Z0-9-]*):([._a-zA-Z0-9-]*)("?)'
+IMAGE_REGEX='([[:space:]]*"?)([._:a-zA-Z0-9-]*)/([._a-zA-Z0-9-]*)/([._a-zA-Z0-9-]*):([._a-zA-Z0-9-]*)("?)'
 
 # We can't use the `-d` option for readarray because
 # registry.centos.org/centos/httpd-24-centos7 ships with Bash 4.2

build/dockerfiles/rhel.Dockerfile

@@ -52,15 +52,16 @@ WORKDIR /build/
 
 # if only including the /latest/ plugins, apply this line to remove them from builder
 RUN if [[ ${LATEST_ONLY} == "true" ]]; then \
-      rm -fr $(find /build/v3 -name 'meta.yaml' | grep -v "/latest/" | grep -o ".*/"); \
+      ./keep_only_latest.sh; \
     fi
 
-RUN ./check_plugins_location.sh v3 && \
+RUN ./generate_latest_metas.sh v3 && \
+    ./check_plugins_location.sh v3 && \
     ./set_plugin_dates.sh v3 && \
     ./check_plugins_viewer_mandatory_fields.sh v3 && \
-    ./ensure_latest_exists.sh && \
     ./index.sh v3 > /build/v3/plugins/index.json && \
-    chmod -c -R g+rwX /build
+    ./list_referenced_images.sh v3 > /build/v3/external_images.txt && \
+    chmod -R g+rwX /build
 
 ################# 
 # PHASE THREE: create ubi8-minimal image with httpd
@@ -69,7 +70,7 @@ RUN ./check_plugins_location.sh v3 && \
 # Build registry, copying meta.yamls and index.json from builder
 # UPSTREAM: use RHEL7/RHSCL/httpd image so we're not required to authenticate with registry.redhat.io
 # https://access.redhat.com/containers/?tab=tags#/registry.access.redhat.com/rhscl/httpd-24-rhel7
-FROM registry.access.redhat.com/rhscl/httpd-24-rhel7:2.4-104 AS registry
+FROM registry.access.redhat.com/rhscl/httpd-24-rhel7:2.4-105 AS registry
 
 # DOWNSTREAM: use RHEL8/httpd
 # https://access.redhat.com/containers/?tab=tags#/registry.access.redhat.com/rhel8/httpd-24
@@ -110,7 +111,7 @@ FROM builder AS offline-builder
 # 2. then add it to dist-git so it's part of this repo
 #    rhpkg new-sources root-local.tgz v3.tgz
 RUN if [ ! -f /tmp/v3.tgz ] || [ ${BOOTSTRAP} == "true" ]; then \
-      ./cache_artifacts.sh v3 && chmod -c -R g+rwX /build; \
+      ./cache_artifacts.sh v3 && chmod -R g+rwX /build; \
     else \
       # in Brew use /var/www/html/; in upstream/ offline-builder use /build/
       mkdir -p /build/v3/; tar xf /tmp/v3.tgz -C /build/v3/; rm -fr /tmp/v3.tgz;  \

build/scripts/check_plugins_viewer_mandatory_fields.sh

@@ -20,7 +20,7 @@ for meta in "${metas[@]}"; do
   plugin_id=$(evaluate_plugin_id "$meta")
   echo "Checking plugin '${plugin_id}'"
 
-  if ! jsonschema ./meta.yaml.schema -F $'\t{error.message}\n' -i <(yq . "${meta}"); then
+  if ! jsonschema "$(dirname "$0")/meta.yaml.schema" -F $'\t{error.message}\n' -i <(yq . "${meta}"); then
     INVALID_JSON=true
   fi
 done

build/scripts/generate_latest_metas.sh

@@ -0,0 +1,32 @@
+#!/bin/bash
+#
+# Copyright (c) 2019 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
+#
+# Utility for automatically generating latest meta.yamls for plugins.
+#
+
+set -e
+
+for plugin_dir in v3/plugins/*/*; do
+  echo "Updating plugin ${plugin_dir}"
+  # Make sure every plugin has a 'latest.version' file
+  if [ ! -f "${plugin_dir}"/latest.txt ]; then
+    echo "    Missing latest.txt: ${plugin_dir}/latest.txt"
+    exit 1
+  fi
+  # Generate meta.yaml for latest version
+  version=$(cat "${plugin_dir}/latest.txt")
+  latest_meta="${plugin_dir}/${version}/meta.yaml"
+  if [ ! -f "${latest_meta}" ]; then
+    echo "    [ERROR]: version.latest specifies '$version' but no such meta.yaml is found"
+    echo "             expecting: '${plugin_dir}/${version}/meta.yaml'"
+  fi
+  echo "    Found latest meta ${plugin_dir}/${version}/meta.yaml"
+  mkdir -p "${plugin_dir}/latest"
+  yq -y '. + {version: "latest"}' "$latest_meta" > "${plugin_dir}/latest/meta.yaml"
+done

build/scripts/keep_only_latest.sh

@@ -0,0 +1,28 @@
+#!/bin/bash
+#
+# Copyright (c) 2019 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
+#
+# Utility for automatically generating latest meta.yamls for plugins.
+#
+
+set -e
+
+for plugin_dir in v3/plugins/*/*; do
+  # Make sure every plugin has a 'latest.version' file
+  if [ ! -f "${plugin_dir}"/latest.txt ]; then
+    echo "    Missing latest.txt: ${plugin_dir}/latest.txt"
+    exit 1
+  fi
+  version=$(cat "${plugin_dir}/latest.txt")
+  readarray -d '' to_remove < <(find "${plugin_dir}" -mindepth 1 -type d -not -name "$version" -print0)
+  if [ ${#to_remove[@]} != 0 ]; then
+    echo "Plugin ${plugin_dir}: found latest ${version} - removing non-latest versions:"
+    printf '    %s\n' "${to_remove[@]}"
+    rm -rf "${to_remove[@]}"
+  fi
+done

build/scripts/list_referenced_images.sh

@@ -0,0 +1,16 @@
+#!/bin/bash
+#
+# Copyright (c) 2019 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
+#
+# List all images referenced in meta.yaml files
+#
+
+set -e
+
+readarray -d '' metas < <(find "$1" -name 'meta.yaml' -print0)
+yq -r '.spec.containers[]?.image' "${metas[@]}" | sort | uniq