Package correct

.docker/docker-compose.yml

@@ -89,7 +89,7 @@ services:
       - --mysqld.address=data-db:3306
       - --config.my-cnf=/.my.cnf
     volumes:
-      - ./dbrepo-data-db/metrics.cnf:/.my.cnf
+      - ./config/metrics.cnf:/.my.cnf
     healthcheck:
       test: -h
       <<: *healthcheck-params

.gitlab-ci.yml

@@ -16,7 +16,7 @@ variables:
   CHART_VERSION: "1.9.0"
   SUPPORTED_VERSIONS: "1.8.0, 1.8.1, 1.8.2, 1.9.0"
   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.

.gitlab/check-supported-images.sh

 #!/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

docker-compose.yml

@@ -365,8 +365,8 @@ services:
     build:
       context: ./dbrepo-ui
       args:
-        APP_VERSION: ${APP_VERSION:-latest}
-        COMMIT: ${CI_COMMIT_SHA:-}
+        APP_VERSION: ${CI_COMMIT_TAG:-latest}
+        COMMIT: ${CI_COMMIT_SHORT_SHA:-}
       network: host
     environment:
       NUXT_PUBLIC_API_CLIENT: "${BASE_URL:-http://localhost}"

install.sh

@@ -3,7 +3,7 @@
 # preset
 VERSION="1.9.0"
 MIN_CPU=8
-MIN_RAM=20
+MIN_RAM=10
 SKIP_CHECKS=${SKIP_CHECKS:-0}
 DOWNLOAD_ONLY=${DOWNLOAD_ONLY:-0}
 
@@ -34,7 +34,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

make/dev.mk

@@ -19,6 +19,7 @@ package-config: ## Package the config files
 	cp ./dbrepo-data-db/1_grant-user.sql ./.docker/config
 	cp ./dbrepo-metadata-db/1_setup-schema.sql ./.docker/config
 	cp ./dbrepo-metadata-db/2_setup-data.sql ./.docker/config
+	cp ./dbrepo-metadata-db/metrics.cnf ./.docker/config
 	cp ./dbrepo-broker-service/rabbitmq.conf ./.docker/config
 	cp ./dbrepo-broker-service/enabled_plugins ./.docker/config
 	cp ./dbrepo-broker-service/definitions.json ./.docker/config
@@ -30,7 +31,7 @@ package-config: ## Package the config files
 	cp ./dbrepo-dashboard-ui/ldap.toml ./.docker/config/ldap.toml
 	cp ./dbrepo-metric-db/prometheus.yml ./.docker/config
 	cp ./dbrepo-storage-service/s3_config.json ./.docker/config
-	cp ./dbrepo-auth-service/listeners/target/create-event-listener.jar ./.docker/config
+	cp ./dbrepo-auth-service/listeners/create-event-listener.jar ./.docker/config
 	cd ./.docker && tar czf ./dist.tar.gz ./docker-compose.yml ./.env ./config
 
 .PHONY: install-staging