diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b6b75b94f640f84b84b7fdce931183705dc975f4..11555f396f08103950f392262533e1e0cc62d46b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -16,7 +16,7 @@ variables: CHART_VERSION: "1.8.2" SUPPORTED_VERSIONS: "1.7.3, 1.8.0, 1.8.1, 1.8.2" SUPPORTED_ARCH: "linux/amd64" - MAINTAINED_SERVICES: "analyse-service, auth-service-init, dashboard-service, dashboard-service-init, data-service, metadata-service, search-db, search-service, search-service-init, storage-service-init, ui" + MAINTAINED_SERVICES: "analyse-service, auth-service-init, dashboard-service, dashboard-service-init, data-service, metadata-service, search-service, search-service-init, storage-service-init, ui" CACHE_FALLBACK_KEY: "${CI_DEFAULT_BRANCH}" # This will supress any download for dependencies and plugins or upload messages which would clutter the console log. # `showDateTime` will show the passed time in milliseconds. You need to specify `--batch-mode` to make this work. diff --git a/.gitlab/check-supported-images.sh b/.gitlab/check-supported-images.sh index 2f1f804e5dd5edc0d0b252ed6d1ecfed33863e69..4c00c7d40bcd134716a0964747708304b2042e13 100755 --- a/.gitlab/check-supported-images.sh +++ b/.gitlab/check-supported-images.sh @@ -1,13 +1,13 @@ #!/bin/bash echo "Starting registry check ..." -if [ -z $SUPPORTED_VERSIONS ]; then +if [[ -z $SUPPORTED_VERSIONS ]]; then echo "[ERROR] Missing environment variable SUPPORTED_VERSIONS" > /dev/stderr exit 1 -elif [ -z $MAINTAINED_SERVICES ]; then +elif [[ -z $MAINTAINED_SERVICES ]]; then echo "[ERROR] Missing environment variable MAINTAINED_SERVICES" > /dev/stderr exit 1 -elif [ -z $CI_REGISTRY2_URL ]; then +elif [[ -z $CI_REGISTRY2_URL ]]; then echo "[ERROR] Missing environment variable CI_REGISTRY2_URL" > /dev/stderr exit 1 fi diff --git a/install.sh b/install.sh index 2fcfead2867c19c792929623bad52ac863d2252a..ab2ca5f7c8cfdc84f0e3c76b0904e2e4566f044d 100644 --- a/install.sh +++ b/install.sh @@ -4,7 +4,7 @@ APP_VERSION="1.8.2" DOC_VERSION="1.8" MIN_CPU=8 -MIN_RAM=20 +MIN_RAM=10 SKIP_CHECKS=${SKIP_CHECKS:-0} DOWNLOAD_ONLY=${DOWNLOAD_ONLY:-0} @@ -35,7 +35,7 @@ if [[ $SKIP_CHECKS -eq 0 ]] && [[ $DOWNLOAD_ONLY -ne 1 ]]; then if [[ $RAM -lt $MIN_RAM ]]; then echo "You do not have enough RAM free resources:" echo "" - echo " - we found ${RAM}GB RAM (free) instead of necessary ${RAM}GB" + echo " - we found ${RAM}GB RAM (free) instead of necessary ${MIN_RAM}GB" echo " - if you believe this is a mistake, skip startup checks with the SKIP_CHECKS=1 flag" exit 4 else