Dev

.docker/.env

 # general
-BASE_URL=https://example.com
-ADMIN_EMAIL=support@example.com
+BASE_URL=http://localhost
+ADMIN_EMAIL=support@localhost
 # password for the identity service admin user
 IDENTITY_SERVICE_ADMIN_PASSWORD=admin
 # password for the auth service admin user
@@ -9,7 +9,7 @@ AUTH_SERVICE_ADMIN_PASSWORD=admin
 METADATA_DB_PASSWORD=dbrepo
 DATA_DB_PASSWORD=dbrepo
 AUTH_DB_PASSWORD=dbrepo
-SEARCH_DB_PASSWORD=dbrepo
+SEARCH_DB_PASSWORD=admin
 # storage service
 S3_SECRET_ACCESS_KEY=seaweedfsadmin
 # internal admin user, requires a change of the value of auth_ldap.dn_lookup_bind.password in dist/rabbitmq.conf

.docker/docker-compose.yml

-version: "3.6"
-
 volumes:
   metadata-db-data:
   data-db-data:
@@ -18,8 +16,8 @@ services:
     image: docker.io/bitnami/mariadb:11.1.3-debian-11-r6
     volumes:
       - metadata-db-data:/bitnami/mariadb
-      - ./dist/setup-schema.sql:/docker-entrypoint-initdb.d/1_setup-schema.sql
-      - ./dist/setup-data.sql:/docker-entrypoint-initdb.d/2_setup-data.sql
+      - ./config/1_setup-schema.sql:/docker-entrypoint-initdb.d/1_setup-schema.sql
+      - ./config/2_setup-data.sql:/docker-entrypoint-initdb.d/2_setup-data.sql
     ports:
       - "3306:3306"
     environment:
@@ -195,10 +193,10 @@ services:
     ports:
       - 5672:5672
     volumes:
-      - ./dist/rabbitmq.conf:/etc/rabbitmq/rabbitmq.conf
-      - ./dist/advanced.config:/etc/rabbitmq/advanced.config
-      - ./dist/enabled_plugins:/etc/rabbitmq/enabled_plugins
-      - ./dist/definitions.json:/app/definitions.json
+      - ./config/rabbitmq.conf:/etc/rabbitmq/rabbitmq.conf
+      - ./config/advanced.config:/etc/rabbitmq/advanced.config
+      - ./config/enabled_plugins:/etc/rabbitmq/enabled_plugins
+      - ./config/definitions.json:/app/definitions.json
       - broker-service-data:/bitnami/rabbitmq/mnesia
     depends_on:
       dbrepo-identity-service:
@@ -300,7 +298,7 @@ services:
       - "80:80"
       - "443:443"
     volumes:
-      - ./dist/dbrepo.conf:/etc/nginx/conf.d/default.conf
+      - ./config/dbrepo.conf:/etc/nginx/conf.d/default.conf
     depends_on:
       dbrepo-analyse-service:
         condition: service_healthy
@@ -363,7 +361,7 @@ services:
     image: docker.io/chrislusf/seaweedfs:3.59
     command: [ "server", "-dir=/data", "-s3", "-s3.port=9000", "-s3.config=/app/s3_config.json", "-metricsPort=9091" ]
     volumes:
-      - ./dist/s3_config.json:/app/s3_config.json
+      - ./config/s3_config.json:/app/s3_config.json
       - storage-service-data:/data
     ports:
       - "9000:9000"

.gitignore

@@ -13,6 +13,7 @@ build/
 tmp.yaml
 .docs/.swagger/api-*
 .scannerwork/
+.docker/config/*
 
 # docs
 .docs/.swagger/dist/

dbrepo-search-service/init/app.py

@@ -2,7 +2,6 @@ import json
 import os
 import logging
 from typing import List
-from flask import current_app
 
 import opensearchpy.exceptions
 from dbrepo.RestClient import RestClient
@@ -49,11 +48,11 @@ class App:
     search_instance: OpenSearch = None
 
     def __init__(self):
-        self.metadata_service_endpoint = current_app.config["METADATA_SERVICE_ENDPOINT"]
-        self.search_host = current_app.config["OPENSEARCH_HOST"]
-        self.search_port = int(current_app.config["OPENSEARCH_PORT"])
-        self.search_username = current_app.config["OPENSEARCH_USERNAME"]
-        self.search_password = current_app.config["OPENSEARCH_PASSWORD"]
+        self.metadata_service_endpoint = os.getenv("METADATA_SERVICE_ENDPOINT")
+        self.search_host = os.getenv("OPENSEARCH_HOST")
+        self.search_port = int(os.getenv("OPENSEARCH_PORT"))
+        self.search_username = os.getenv("OPENSEARCH_USERNAME")
+        self.search_password = os.getenv("OPENSEARCH_PASSWORD")
 
     def _instance(self) -> OpenSearch:
         """

docker-compose.yml

-version: "3.6"
-
 volumes:
   metadata-db-data:
   data-db-data:
@@ -18,8 +16,8 @@ services:
     image: docker.io/bitnami/mariadb:11.1.3-debian-11-r6
     volumes:
       - metadata-db-data:/bitnami/mariadb
-      - ./dbrepo-metadata-db/setup-schema.sql:/docker-entrypoint-initdb.d/1_setup-schema.sql
-      - ./dbrepo-metadata-db/setup-data.sql:/docker-entrypoint-initdb.d/2_setup-data.sql
+      - ./dbrepo-metadata-db/1_setup-schema.sql:/docker-entrypoint-initdb.d/1_setup-schema.sql
+      - ./dbrepo-metadata-db/2_setup-data.sql:/docker-entrypoint-initdb.d/2_setup-data.sql
     ports:
       - "3306:3306"
     environment:

install.sh

@@ -41,7 +41,7 @@ if [[ $SKIP_CHECKS -eq 0 ]] && [[ $DOWNLOAD_ONLY -ne 1 ]]; then
   else
     echo "RAM ${RAM}GB OK"
   fi
-  MAX_MAP_COUNT=$(cat /etc/sysctl.conf | grep -oP "vm.max_map_count=.*" | grep -oP "[0-9]+")
+  MAX_MAP_COUNT=$(cat /proc/sys/vm/max_map_count)
   if [[ $MAX_MAP_COUNT -lt $MIN_MAP_COUNT ]]; then
     echo "You do not have enough max. map counts:"
     echo ""
@@ -58,17 +58,8 @@ fi
 
 # environment
 echo "[🚀] Gathering environment for version ${VERSION} ..."
-mkdir -p ./dist
-curl -sSL -o ./docker-compose.yml "https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/raw/release-${VERSION}/.docker/docker-compose.yml"
-curl -sSL -o ./.env "https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/raw/release-${VERSION}/.docker/.env"
-curl -sSL -o ./dist/1_setup-schema.sql "https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/raw/release-${VERSION}/dbrepo-metadata-db/setup-schema.sql"
-curl -sSL -o ./dist/2_setup-data.sql "https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/raw/release-${VERSION}/dbrepo-metadata-db/setup-data.sql"
-curl -sSL -o ./dist/rabbitmq.conf "https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/raw/release-${VERSION}/dbrepo-broker-service/rabbitmq.conf"
-curl -sSL -o ./dist/enabled_plugins "https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/raw/release-${VERSION}/dbrepo-broker-service/enabled_plugins"
-curl -sSL -o ./dist/definitions.json "https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/raw/release-${VERSION}/dbrepo-broker-service/definitions.json"
-curl -sSL -o ./dist/advanced.config "https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/raw/release-${VERSION}/dbrepo-broker-service/advanced.config"
-curl -sSL -o ./dist/dbrepo.conf "https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/raw/release-${VERSION}/dbrepo-gateway-service/dbrepo.conf"
-curl -sSL -o ./dist/s3_config.json "https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/raw/release-${VERSION}/dbrepo-storage-service/s3_config.json"
+curl -sSL -o ./dist.tar.gz "https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/raw/release-${VERSION}/.docker/dist.tar.gz"
+tar xzfv ./dist.tar.gz
 
 if [[ $DOWNLOAD_ONLY -eq 1 ]]; then
   echo "[🎉] Successfully downloaded environment!"

make/dev.mk

@@ -8,3 +8,15 @@ start-dev: build-images ## Start the development deployment.
 .PHONY: stop-dev
 stop-dev: ## Stop the development deployment and remove all data.
 	docker compose down
+
+.PHONY: package-config
+package-config: ## Package the config files
+	cp ./dbrepo-metadata-db/1_setup-schema.sql ./.docker/config
+	cp ./dbrepo-metadata-db/2_setup-data.sql ./.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
+	cp ./dbrepo-broker-service/advanced.config ./.docker/config
+	cp ./dbrepo-storage-service/s3_config.json ./.docker/config
+	cp ./dbrepo-gateway-service/dbrepo.conf ./.docker/config
+	cd ./.docker && tar czfv ./dist.tar.gz ./docker-compose.yml ./.env ./config