Skip to content
Snippets Groups Projects
Commit 593a3cf7 authored by Martin Weise's avatar Martin Weise
Browse files

Merge branch '398-replace-minio-with-seaweedfs' into 'dev'

Replacing minIO with SeaweedFS

See merge request !218
parents 2c24875b 6a6cb385
Branches
Tags
4 merge requests!231CI: Remove build for log-service,!228Better error message handling in the frontend,!223Release of version 1.4.0,!218Replacing minIO with SeaweedFS
...@@ -61,11 +61,6 @@ ...@@ -61,11 +61,6 @@
"blank": true, "blank": true,
"href": "http://localhost/admin/dashboard/" "href": "http://localhost/admin/dashboard/"
}, },
{
"text": "Storage Admin",
"blank": true,
"href": "http://localhost/admin/storage/"
},
{ {
"text": "RabbitMQ Admin", "text": "RabbitMQ Admin",
"blank": true, "blank": true,
......
...@@ -39,7 +39,7 @@ services: ...@@ -39,7 +39,7 @@ services:
restart: "no" restart: "no"
container_name: dbrepo-data-db container_name: dbrepo-data-db
hostname: data-db hostname: data-db
image: docker.io/bitnami/mariadb:11.1.3 image: docker.io/bitnami/mariadb-galera:11.1.3-debian-11-r0
volumes: volumes:
- data-db-data:/bitnami/mariadb - data-db-data:/bitnami/mariadb
- "${SHARED_FILESYSTEM:-/tmp}:/tmp" - "${SHARED_FILESYSTEM:-/tmp}:/tmp"
...@@ -47,6 +47,7 @@ services: ...@@ -47,6 +47,7 @@ services:
- "3307:3306" - "3307:3306"
environment: environment:
MARIADB_ROOT_PASSWORD: "${USER_DB_PASSWORD:-dbrepo}" MARIADB_ROOT_PASSWORD: "${USER_DB_PASSWORD:-dbrepo}"
MARIADB_GALERA_MARIABACKUP_PASSWORD: "${USER_DB_BACKUP_PASSWORD:-dbrepo}"
healthcheck: healthcheck:
test: mysqladmin ping --user="${USER_DB_USERNAME:-root}" --password="${USER_DB_PASSWORD:-dbrepo}" --silent test: mysqladmin ping --user="${USER_DB_USERNAME:-root}" --password="${USER_DB_PASSWORD:-dbrepo}" --silent
interval: 10s interval: 10s
...@@ -178,8 +179,8 @@ services: ...@@ -178,8 +179,8 @@ services:
- "5000:5000" - "5000:5000"
environment: environment:
S3_STORAGE_ENDPOINT: "${STORAGE_ENDPOINT:-http://storage-service:9000}" S3_STORAGE_ENDPOINT: "${STORAGE_ENDPOINT:-http://storage-service:9000}"
S3_ACCESS_KEY_ID: "${STORAGE_USERNAME:-minioadmin}" S3_ACCESS_KEY_ID: "${STORAGE_USERNAME:-seaweedfsadmin}"
S3_SECRET_ACCESS_KEY: "${STORAGE_PASSWORD:-minioadmin}" S3_SECRET_ACCESS_KEY: "${STORAGE_PASSWORD:-seaweedfsadmin}"
volumes: volumes:
- "${SHARED_FILESYSTEM:-/tmp}:/tmp" - "${SHARED_FILESYSTEM:-/tmp}:/tmp"
healthcheck: healthcheck:
...@@ -258,8 +259,8 @@ services: ...@@ -258,8 +259,8 @@ services:
environment: environment:
FLASK_DEBUG: ${SEARCH_DEBUG_MODE:-true} FLASK_DEBUG: ${SEARCH_DEBUG_MODE:-true}
S3_STORAGE_ENDPOINT: "${STORAGE_ENDPOINT:-http://storage-service:9000}" S3_STORAGE_ENDPOINT: "${STORAGE_ENDPOINT:-http://storage-service:9000}"
S3_ACCESS_KEY_ID: "${STORAGE_USERNAME:-minioadmin}" S3_ACCESS_KEY_ID: "${STORAGE_USERNAME:-seaweedfsadmin}"
S3_SECRET_ACCESS_KEY: ${STORAGE_PASSWORD:-minioadmin} S3_SECRET_ACCESS_KEY: ${STORAGE_PASSWORD:-seaweedfsadmin}
volumes: volumes:
- "${SHARED_FILESYSTEM:-/tmp}:/tmp" - "${SHARED_FILESYSTEM:-/tmp}:/tmp"
healthcheck: healthcheck:
...@@ -342,22 +343,18 @@ services: ...@@ -342,22 +343,18 @@ services:
restart: "no" restart: "no"
container_name: dbrepo-storage-service container_name: dbrepo-storage-service
hostname: storage-service hostname: storage-service
image: docker.io/bitnami/minio:2023-debian-11 image: docker.io/dbrepo/storage-service:latest
environment: build: ./dbrepo-storage-service
MINIO_ROOT_USER: "${STORAGE_USERNAME:-minioadmin}"
MINIO_ROOT_PASSWORD: "${STORAGE_PASSWORD:-minioadmin}"
MINIO_DEFAULT_BUCKETS: "${STORAGE_DBREPO_BUCKET:-dbrepo-upload:upload,dbrepo-download:download}"
MINIO_REGION_NAME: "${STORAGE_REGION_NAME:-eu-west-1}"
MINIO_BROWSER_REDIRECT_URL: "${STORAGE_BASE_URL:-http://localhost/admin/storage/}"
ports: ports:
- 9000:9000 - 9000:9000
volumes:
- ./dist/s3_config.json:/app/s3_config.json
- storage-service-data:/data
healthcheck: healthcheck:
test: [ "CMD", "mc", "ready", "local" ] test: curl -sSL 127.0.0.1:9000 || exit 1
interval: 5s interval: 10s
timeout: 5s timeout: 5s
retries: 5 retries: 12
volumes:
- storage-service-data:/bitnami/minio/data
logging: logging:
driver: json-file driver: json-file
...@@ -373,9 +370,9 @@ services: ...@@ -373,9 +370,9 @@ services:
- "-s3-endpoint=${STORAGE_ENDPOINT:-http://storage-service:9000}" - "-s3-endpoint=${STORAGE_ENDPOINT:-http://storage-service:9000}"
- "-s3-bucket=dbrepo-upload" - "-s3-bucket=dbrepo-upload"
environment: environment:
AWS_ACCESS_KEY_ID: "${STORAGE_USERNAME:-minioadmin}" AWS_ACCESS_KEY_ID: "${STORAGE_USERNAME:-seaweedfsadmin}"
AWS_SECRET_ACCESS_KEY: "${STORAGE_PASSWORD:-minioadmin}" AWS_SECRET_ACCESS_KEY: "${STORAGE_PASSWORD:-seaweedfsadmin}"
AWS_REGION: "${STORAGE_REGION_NAME:-eu-west-1}" AWS_REGION: "${STORAGE_REGION_NAME:-default}"
depends_on: depends_on:
dbrepo-storage-service: dbrepo-storage-service:
condition: service_healthy condition: service_healthy
......
...@@ -183,8 +183,8 @@ services: ...@@ -183,8 +183,8 @@ services:
- "5000:5000" - "5000:5000"
environment: environment:
S3_STORAGE_ENDPOINT: "${STORAGE_ENDPOINT:-http://storage-service:9000}" S3_STORAGE_ENDPOINT: "${STORAGE_ENDPOINT:-http://storage-service:9000}"
S3_ACCESS_KEY_ID: "${STORAGE_USERNAME:-minioadmin}" S3_ACCESS_KEY_ID: "${STORAGE_USERNAME:-seaweedfsadmin}"
S3_SECRET_ACCESS_KEY: "${STORAGE_PASSWORD:-minioadmin}" S3_SECRET_ACCESS_KEY: "${STORAGE_PASSWORD:-seaweedfsadmin}"
volumes: volumes:
- "${SHARED_FILESYSTEM:-/tmp}:/tmp" - "${SHARED_FILESYSTEM:-/tmp}:/tmp"
healthcheck: healthcheck:
...@@ -266,8 +266,8 @@ services: ...@@ -266,8 +266,8 @@ services:
environment: environment:
FLASK_DEBUG: ${SEARCH_DEBUG_MODE:-true} FLASK_DEBUG: ${SEARCH_DEBUG_MODE:-true}
S3_STORAGE_ENDPOINT: "${STORAGE_ENDPOINT:-http://storage-service:9000}" S3_STORAGE_ENDPOINT: "${STORAGE_ENDPOINT:-http://storage-service:9000}"
S3_ACCESS_KEY_ID: "${STORAGE_USERNAME:-minioadmin}" S3_ACCESS_KEY_ID: "${STORAGE_USERNAME:-seaweedfsadmin}"
S3_SECRET_ACCESS_KEY: ${STORAGE_PASSWORD:-minioadmin} S3_SECRET_ACCESS_KEY: ${STORAGE_PASSWORD:-seaweedfsadmin}
volumes: volumes:
- "${SHARED_FILESYSTEM:-/tmp}:/tmp" - "${SHARED_FILESYSTEM:-/tmp}:/tmp"
healthcheck: healthcheck:
...@@ -352,22 +352,18 @@ services: ...@@ -352,22 +352,18 @@ services:
restart: "no" restart: "no"
container_name: dbrepo-storage-service container_name: dbrepo-storage-service
hostname: storage-service hostname: storage-service
image: docker.io/bitnami/minio:2023-debian-11 image: dbrepo-storage-service:latest
environment: build: ./dbrepo-storage-service
MINIO_ROOT_USER: "${STORAGE_USERNAME:-minioadmin}"
MINIO_ROOT_PASSWORD: "${STORAGE_PASSWORD:-minioadmin}"
MINIO_DEFAULT_BUCKETS: "${STORAGE_DBREPO_BUCKET:-dbrepo-upload:upload,dbrepo-download:download}"
MINIO_REGION_NAME: "${STORAGE_REGION_NAME:-eu-west-1}"
MINIO_BROWSER_REDIRECT_URL: "${STORAGE_BASE_URL:-http://localhost/admin/storage/}"
ports: ports:
- 9000:9000 - 9000:9000
volumes:
- ./dbrepo-storage-service/s3_config.json:/app/s3_config.json
- storage-service-data:/data
healthcheck: healthcheck:
test: [ "CMD", "mc", "ready", "local" ] test: curl -sSL 127.0.0.1:9000 || exit 1
interval: 5s interval: 10s
timeout: 5s timeout: 5s
retries: 5 retries: 12
volumes:
- storage-service-data:/bitnami/minio/data
logging: logging:
driver: json-file driver: json-file
...@@ -383,9 +379,9 @@ services: ...@@ -383,9 +379,9 @@ services:
- "-s3-endpoint=${STORAGE_ENDPOINT:-http://storage-service:9000}" - "-s3-endpoint=${STORAGE_ENDPOINT:-http://storage-service:9000}"
- "-s3-bucket=dbrepo-upload" - "-s3-bucket=dbrepo-upload"
environment: environment:
AWS_ACCESS_KEY_ID: "${STORAGE_USERNAME:-minioadmin}" AWS_ACCESS_KEY_ID: "${STORAGE_USERNAME:-seaweedfsadmin}"
AWS_SECRET_ACCESS_KEY: "${STORAGE_PASSWORD:-minioadmin}" AWS_SECRET_ACCESS_KEY: "${STORAGE_PASSWORD:-seaweedfsadmin}"
AWS_REGION: "${STORAGE_REGION_NAME:-eu-west-1}" AWS_REGION: "${STORAGE_REGION_NAME:-default}"
depends_on: depends_on:
dbrepo-storage-service: dbrepo-storage-service:
condition: service_healthy condition: service_healthy
......
...@@ -23,6 +23,7 @@ curl -sSL -o ./dist/definitions.json https://gitlab.phaidra.org/fair-data-austri ...@@ -23,6 +23,7 @@ curl -sSL -o ./dist/definitions.json https://gitlab.phaidra.org/fair-data-austri
curl -sSL -o ./dist/dbrepo.conf https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/raw/dev/dbrepo-gateway-service/dbrepo.conf curl -sSL -o ./dist/dbrepo.conf https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/raw/dev/dbrepo-gateway-service/dbrepo.conf
curl -sSL -o ./dist/opensearch_dashboards.yml https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/raw/dev/dbrepo-search-db/opensearch_dashboards.yml curl -sSL -o ./dist/opensearch_dashboards.yml https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/raw/dev/dbrepo-search-db/opensearch_dashboards.yml
curl -sSL -o ./dist/dbrepo.config.json https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/raw/dev/dbrepo-ui/dbrepo.config.json curl -sSL -o ./dist/dbrepo.config.json https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/raw/dev/dbrepo-ui/dbrepo.config.json
curl -sSL -o ./dist/s3_config.json https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/raw/dev/dbrepo-storage-service/s3_config.json
echo "[📦] Pulling images ..." echo "[📦] Pulling images ..."
docker compose pull docker compose pull
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment