Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
DBRepo
Manage
Activity
Members
Labels
Plan
External wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Package registry
Model registry
Operate
Terraform modules
Analyze
Contributor analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
FAIR Data Austria DB Repository
DBRepo
Commits
593a3cf7
Commit
593a3cf7
authored
Dec 4, 2023
by
Martin Weise
Browse files
Options
Downloads
Plain Diff
Merge branch '398-replace-minio-with-seaweedfs' into 'dev'
Replacing minIO with SeaweedFS See merge request
!218
parents
2c24875b
6a6cb385
Branches
Branches containing commit
Tags
Tags containing commit
4 merge requests
!231
CI: Remove build for log-service
,
!228
Better error message handling in the frontend
,
!223
Release of version 1.4.0
,
!218
Replacing minIO with SeaweedFS
Changes
24
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
dbrepo-ui/dbrepo.config.json
+0
-5
0 additions, 5 deletions
dbrepo-ui/dbrepo.config.json
docker-compose.prod.yml
+17
-20
17 additions, 20 deletions
docker-compose.prod.yml
docker-compose.yml
+15
-19
15 additions, 19 deletions
docker-compose.yml
install.sh
+1
-0
1 addition, 0 deletions
install.sh
with
33 additions
and
44 deletions
dbrepo-ui/dbrepo.config.json
+
0
−
5
View file @
593a3cf7
...
@@ -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
,
...
...
This diff is collapsed.
Click to expand it.
docker-compose.prod.yml
+
17
−
20
View file @
593a3cf7
...
@@ -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:-
minio
admin}"
S3_ACCESS_KEY_ID
:
"
${STORAGE_USERNAME:-
seaweedfs
admin}"
S3_SECRET_ACCESS_KEY
:
"
${STORAGE_PASSWORD:-
minio
admin}"
S3_SECRET_ACCESS_KEY
:
"
${STORAGE_PASSWORD:-
seaweedfs
admin}"
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:-
minio
admin}"
S3_ACCESS_KEY_ID
:
"
${STORAGE_USERNAME:-
seaweedfs
admin}"
S3_SECRET_ACCESS_KEY
:
${STORAGE_PASSWORD:-
minio
admin}
S3_SECRET_ACCESS_KEY
:
${STORAGE_PASSWORD:-
seaweedfs
admin}
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
:
5
s
interval
:
10
s
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:-
minio
admin}"
AWS_ACCESS_KEY_ID
:
"
${STORAGE_USERNAME:-
seaweedfs
admin}"
AWS_SECRET_ACCESS_KEY
:
"
${STORAGE_PASSWORD:-
minio
admin}"
AWS_SECRET_ACCESS_KEY
:
"
${STORAGE_PASSWORD:-
seaweedfs
admin}"
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
...
...
This diff is collapsed.
Click to expand it.
docker-compose.yml
+
15
−
19
View file @
593a3cf7
...
@@ -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:-
minio
admin}"
S3_ACCESS_KEY_ID
:
"
${STORAGE_USERNAME:-
seaweedfs
admin}"
S3_SECRET_ACCESS_KEY
:
"
${STORAGE_PASSWORD:-
minio
admin}"
S3_SECRET_ACCESS_KEY
:
"
${STORAGE_PASSWORD:-
seaweedfs
admin}"
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:-
minio
admin}"
S3_ACCESS_KEY_ID
:
"
${STORAGE_USERNAME:-
seaweedfs
admin}"
S3_SECRET_ACCESS_KEY
:
${STORAGE_PASSWORD:-
minio
admin}
S3_SECRET_ACCESS_KEY
:
${STORAGE_PASSWORD:-
seaweedfs
admin}
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
:
5
s
interval
:
10
s
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:-
minio
admin}"
AWS_ACCESS_KEY_ID
:
"
${STORAGE_USERNAME:-
seaweedfs
admin}"
AWS_SECRET_ACCESS_KEY
:
"
${STORAGE_PASSWORD:-
minio
admin}"
AWS_SECRET_ACCESS_KEY
:
"
${STORAGE_PASSWORD:-
seaweedfs
admin}"
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
...
...
This diff is collapsed.
Click to expand it.
install.sh
+
1
−
0
View file @
593a3cf7
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
Prev
1
2
Next
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment