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
94a45c8f
Verified
Commit
94a45c8f
authored
1 year ago
by
Martin Weise
Browse files
Options
Downloads
Patches
Plain Diff
Added sanity checks
parent
d7e9e66e
No related branches found
No related tags found
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
,
!193
Resolve "Default values for .env"
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
.gitlab-ci.yml
+18
-0
18 additions, 0 deletions
.gitlab-ci.yml
docker-compose.prod.yml
+95
-29
95 additions, 29 deletions
docker-compose.prod.yml
with
113 additions
and
29 deletions
.gitlab-ci.yml
+
18
−
0
View file @
94a45c8f
...
@@ -17,6 +17,7 @@ stages:
...
@@ -17,6 +17,7 @@ stages:
-
build-frontend
-
build-frontend
-
test-backend
-
test-backend
-
test-frontend
-
test-frontend
-
test-deployment
-
build-docker
-
build-docker
-
scan-docker
-
scan-docker
-
release-docker
-
release-docker
...
@@ -121,6 +122,23 @@ test-frontend:
...
@@ -121,6 +122,23 @@ test-frontend:
path
:
./dbrepo-ui/coverage/cobertura-coverage.xml
path
:
./dbrepo-ui/coverage/cobertura-coverage.xml
coverage
:
'
/TOTAL.*?([0-9]{1,3})%/'
coverage
:
'
/TOTAL.*?([0-9]{1,3})%/'
test-default-deployment
:
stage
:
test-deployment
needs
:
-
test-frontend
script
:
-
"
rm
-f
.env"
-
"
docker
compose
up
-d
||
docker
compose
down"
coverage
:
'
/TOTAL.*?([0-9]{1,3})%/'
test-env-deployment
:
stage
:
test-deployment
needs
:
-
test-frontend
script
:
-
"
cp
.env.unix.example
.env"
-
"
docker
compose
up
-d
||
docker
compose
down"
scan-analyse-service
:
scan-analyse-service
:
stage
:
scan-docker
stage
:
scan-docker
needs
:
needs
:
...
...
This diff is collapsed.
Click to expand it.
docker-compose.prod.yml
+
95
−
29
View file @
94a45c8f
...
@@ -41,8 +41,9 @@ services:
...
@@ -41,8 +41,9 @@ services:
-
./setup-schema_local.sql:/docker-entrypoint-initdb.d/setup-schema_local.sql
-
./setup-schema_local.sql:/docker-entrypoint-initdb.d/setup-schema_local.sql
ports
:
ports
:
-
"
3306:3306"
-
"
3306:3306"
env_file
:
environment
:
-
.env
MARIADB_DATABASE
:
"
${METADATA_DB:-fda}"
MARIADB_ROOT_PASSWORD
:
"
${METADATA_PASSWORD:-dbrepo}"
healthcheck
:
healthcheck
:
test
:
mysqladmin ping --user="$METADATA_USERNAME" --password="$METADATA_PASSWORD" --silent
test
:
mysqladmin ping --user="$METADATA_USERNAME" --password="$METADATA_PASSWORD" --silent
interval
:
10s
interval
:
10s
...
@@ -55,18 +56,16 @@ services:
...
@@ -55,18 +56,16 @@ services:
restart
:
"
no"
restart
:
"
no"
container_name
:
dbrepo-data-db
container_name
:
dbrepo-data-db
hostname
:
data-db
hostname
:
data-db
image
:
mariadb:10.5
image
:
bitnami/
mariadb:10.5
networks
:
networks
:
core
:
core
:
volumes
:
volumes
:
-
data-db-data:/bitnami/mariadb
-
data-db-data:/bitnami/mariadb
-
"
${SHARED_FILESYSTEM}:/tmp"
-
"
${SHARED_FILESYSTEM
:-/tmp
}:/tmp"
ports
:
ports
:
-
"
3307:3306"
-
"
3307:3306"
env_file
:
-
.env
environment
:
environment
:
-
MARIADB_ROOT_PASSWORD
=$
USER_DB_PASSWORD
MARIADB_ROOT_PASSWORD
:
"
${
USER_DB_PASSWORD
:-dbrepo}"
healthcheck
:
healthcheck
:
test
:
mysqladmin ping --user="$USER_DB_USERNAME" --password="$USER_DB_PASSWORD" --silent
test
:
mysqladmin ping --user="$USER_DB_USERNAME" --password="$USER_DB_PASSWORD" --silent
interval
:
10s
interval
:
10s
...
@@ -86,11 +85,9 @@ services:
...
@@ -86,11 +85,9 @@ services:
-
auth-db-data:/bitnami/mariadb
-
auth-db-data:/bitnami/mariadb
ports
:
ports
:
-
"
3308:3306"
-
"
3308:3306"
env_file
:
-
.env
environment
:
environment
:
-
MARIADB_
ROOT_PASSWORD=$AUTH_PASSWORD
MARIADB_
DATABASE
:
"
${AUTH_DB:-keycloak}"
-
MARIADB_
DATABASE=$AUTH_DB
MARIADB_
ROOT_PASSWORD
:
"
${AUTH_PASSWORD:-dbrepo}"
healthcheck
:
healthcheck
:
test
:
mysqladmin ping --user="$AUTH_USERNAME" --password="$AUTH_PASSWORD" --silent
test
:
mysqladmin ping --user="$AUTH_USERNAME" --password="$AUTH_PASSWORD" --silent
interval
:
10s
interval
:
10s
...
@@ -108,11 +105,9 @@ services:
...
@@ -108,11 +105,9 @@ services:
-
"
--base-path=/api/upload/files/"
-
"
--base-path=/api/upload/files/"
networks
:
networks
:
core
:
core
:
env_file
:
-
.env
volumes
:
volumes
:
-
upload-service-data:/data
-
upload-service-data:/data
-
"
${SHARED_FILESYSTEM}:/srv/tusd-data/data"
-
"
${SHARED_FILESYSTEM
:-/tmp
}:/srv/tusd-data/data"
logging
:
logging
:
driver
:
json-file
driver
:
json-file
...
@@ -126,12 +121,16 @@ services:
...
@@ -126,12 +121,16 @@ services:
ports
:
ports
:
-
"
8443:8443"
-
"
8443:8443"
-
"
8080:8080"
-
"
8080:8080"
env_file
:
environment
:
-
.env
AUTH_DB
:
"
${AUTH_DB:-keycloak}"
KC_DB_USERNAME
:
"
${AUTH_USERNAME:-root}"
KC_DB_PASSWORD
:
"
${AUTH_PASSWORD:-dbrepo}"
KEYCLOAK_ADMIN
:
"
${KEYCLOAK_ADMIN:-fda}"
KEYCLOAK_ADMIN_PASSWORD
:
"
${KEYCLOAK_ADMIN_PASSWORD:-fda}"
volumes
:
volumes
:
-
authentication-service-data:/opt/keycloak/data/
-
authentication-service-data:/opt/keycloak/data/
depends_on
:
depends_on
:
dbrepo-
metadata
-db
:
dbrepo-
auth
-db
:
condition
:
service_healthy
condition
:
service_healthy
logging
:
logging
:
driver
:
json-file
driver
:
json-file
...
@@ -143,12 +142,40 @@ services:
...
@@ -143,12 +142,40 @@ services:
image
:
dbrepo/metadata-service:latest
image
:
dbrepo/metadata-service:latest
networks
:
networks
:
core
:
core
:
env_file
:
-
.env
volumes
:
volumes
:
-
"
${SHARED_FILESYSTEM}:/tmp"
-
"
${SHARED_FILESYSTEM
:-/tmp
}:/tmp"
ports
:
ports
:
-
"
9099:9099"
-
"
9099:9099"
environment
:
ADMIN_MAIL
:
"
${ADMIN_MAIL:-noreply@localhost}"
BASE_URL
:
"
${BASE_URL:-http://localhost}"
GRANT_PRIVILEGES
:
"
${GRANT_PRIVILEGES:-SELECT,
CREATE,
CREATE
VIEW,
CREATE
ROUTINE,
CREATE
TEMPORARY
TABLES,
LOCK
TABLES,
INDEX,
TRIGGER,
INSERT,
UPDATE,
DELETE}"
BROKER_CONSUMERS
:
"
${BROKER_CONSUMERS:-2}"
BROKER_ENDPOINT
:
"
${BROKER_ENDPOINT:-http://broker-service:15672}"
BROKER_USERNAME
:
"
${BROKER_USERNAME:-fda}"
BROKER_PASSWORD
:
"
${BROKER_PASSWORD:-fda}"
DELETED_RECORD
:
"
${DELETED_RECORD:-persistent}"
EARLIEST_DATESTAMP
:
"
${EARLIEST_DATESTAMP:-2022-09-17T18:23:00Z}"
GRANULARITY
:
"
${GRANULARITY:-YYYY-MM-DDThh:mm:ssZ}"
JWT_ISSUER
:
"
${JWT_ISSUER:-http://localhost/realms/dbrepo}"
JWT_PUBKEY
:
"
${JWT_PUBKEY:-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqqnHQ2BWWW9vDNLRCcxD++xZg/16oqMo/c1l+lcFEjjAIJjJp/HqrPYU/U9GvquGE6PbVFtTzW1KcKawOW+FJNOA3CGo8Q1TFEfz43B8rZpKsFbJKvQGVv1Z4HaKPvLUm7iMm8Hv91cLduuoWx6Q3DPe2vg13GKKEZe7UFghF+0T9u8EKzA/XqQ0OiICmsmYPbwvf9N3bCKsB/Y10EYmZRb8IhCoV9mmO5TxgWgiuNeCTtNCv2ePYqL/U0WvyGFW0reasIK8eg3KrAUj8DpyOgPOVBn3lBGf+3KFSYi+0bwZbJZWqbC/Xlk20Go1YfeJPRIt7ImxD27R/lNjgDO/MwIDAQAB}"
LOG_LEVEL
:
"
${LOG_LEVEL:-debug}"
METADATA_DB
:
"
${METADATA_DB:-fda}"
METADATA_HOST
:
"
${METADATA_HOST:-metadata-db}"
METADATA_JDBC_EXTRA_ARGS
:
"
${METADATA_JDBC_EXTRA_ARGS:-}"
METADATA_USERNAME
:
"
${METADATA_USERNAME:-root}"
METADATA_PASSWORD
:
"
${METADATA_PASSWORD:-dbrepo}"
NOT_SUPPORTED_KEYWORDS
:
"
${NOT_SUPPORTED_KEYWORDS:-
\\
*,AVG,BIT_AND,BIT_OR,BIT_XOR,COUNT,COUNTDISTINCT,GROUP_CONCAT,JSON_ARRAYAGG,JSON_OBJECTAGG,MAX,MIN,STD,STDDEV,STDDEV_POP,STDDEV_SAMP,SUM,VARIANCE,VAR_POP,VAR_SAMP,--}"
PID_BASE
:
"
${PID_BASE:-http://localhost/pid/}"
REPOSITORY_NAME
:
"
${REPOSITORY_NAME:-Example
Repository}"
SEARCH_USERNAME
:
"
${SEARCH_USERNAME:-admin}"
SEARCH_PASSWORD
:
"
${SEARCH_PASSWORD:-admin}"
SHARED_FILESYSTEM
:
"
${SHARED_FILESYSTEM:-/tmp}"
USER_NETWORK
:
"
${USER_NETWORK:-userdb}"
WEBSITE
:
"
${WEBSITE:-http://localhost}"
KEYCLOAK_HOST
:
"
${KEYCLOAK_HOST:-http://authentication-service:8080}"
KEYCLOAK_ADMIN
:
"
${KEYCLOAK_ADMIN:-fda}"
KEYCLOAK_ADMIN_PASSWORD
:
"
${KEYCLOAK_ADMIN_PASSWORD:-fda}"
healthcheck
:
healthcheck
:
test
:
wget -qO- localhost:9099/actuator/health/readiness | grep -q "UP" || exit
1
test
:
wget -qO- localhost:9099/actuator/health/readiness | grep -q "UP" || exit
1
interval
:
10s
interval
:
10s
...
@@ -173,10 +200,8 @@ services:
...
@@ -173,10 +200,8 @@ services:
core
:
core
:
ports
:
ports
:
-
"
5000:5000"
-
"
5000:5000"
env_file
:
-
.env
volumes
:
volumes
:
-
"
${SHARED_FILESYSTEM}:/tmp"
-
"
${SHARED_FILESYSTEM
:-/tmp
}:/tmp"
logging
:
logging
:
driver
:
json-file
driver
:
json-file
...
@@ -190,8 +215,6 @@ services:
...
@@ -190,8 +215,6 @@ services:
ports
:
ports
:
-
"
5672:5672"
-
"
5672:5672"
-
"
15672:15672"
-
"
15672:15672"
env_file
:
-
.env
depends_on
:
depends_on
:
dbrepo-authentication-service
:
dbrepo-authentication-service
:
condition
:
service_healthy
condition
:
service_healthy
...
@@ -209,8 +232,6 @@ services:
...
@@ -209,8 +232,6 @@ services:
core
:
core
:
ports
:
ports
:
-
9200:9200
-
9200:9200
env_file
:
-
.env
healthcheck
:
healthcheck
:
test
:
curl -s localhost:9200/_cat/indices || exit
1
test
:
curl -s localhost:9200/_cat/indices || exit
1
interval
:
10s
interval
:
10s
...
@@ -238,8 +259,22 @@ services:
...
@@ -238,8 +259,22 @@ services:
networks
:
networks
:
core
:
core
:
public
:
public
:
env_file
:
environment
:
-
.env
BROKER_USERNAME
:
"
${BROKER_USERNAME:-fda}"
BROKER_PASSWORD
:
"
${BROKER_PASSWORD:-fda}"
BROKER_LOGIN_URL
:
"
${BROKER_LOGIN_URL:-/broker/}"
KEYCLOAK_LOGIN_URL
:
"
${KEYCLOAK_LOGIN_URL:-/api/auth/}"
SHARED_FILESYSTEM
:
"
${SHARED_FILESYSTEM:-/tmp}"
LOGO
:
"
${LOGO:-/logo.png}"
SEARCH_USERNAME
:
"
${SEARCH_USERNAME:-admin}"
SEARCH_PASSWORD
:
"
${SEARCH_PASSWORD:-admin}"
VERSION
:
"
${VERSION:-${TAG}}"
TITLE
:
"
${TITLE:-Database
Repository}"
ICON
:
"
${ICON:-/favicon.ico}"
DBREPO_CLIENT_ID
:
"
${DBREPO_CLIENT_ID:-dbrepo-client}"
DBREPO_CLIENT_SECRET
:
"
${DBREPO_CLIENT_SECRET:-MUwRc7yfXSJwX8AdRMWaQC3Nep1VjwgG}"
UPLOAD_PATH
:
"
${UPLOAD_PATH:-/tmp/}"
FORCE_SSL
:
"
${FORCE_SSL:-false}"
depends_on
:
depends_on
:
dbrepo-upload-service
:
dbrepo-upload-service
:
condition
:
service_started
condition
:
service_started
...
@@ -274,3 +309,34 @@ services:
...
@@ -274,3 +309,34 @@ services:
condition
:
service_started
condition
:
service_started
logging
:
logging
:
driver
:
json-file
driver
:
json-file
dbrepo-search-sync-agent
:
restart
:
"
no"
container_name
:
dbrepo-search-sync-agent
hostname
:
search-startup-agent
image
:
dbrepo/search-sync-agent:latest
networks
:
core
:
environment
:
METADATA_DB
:
${METADATA_DB:-fda}
METADATA_HOST
:
${METADATA_HOST:-metadata-db}
METADATA_JDBC_EXTRA_ARGS
:
${METADATA_JDBC_EXTRA_ARGS:-}
METADATA_PASSWORD
:
${METADATA_PASSWORD:-dbrepo}
METADATA_USERNAME
:
${METADATA_USERNAME:-root}
SEARCH_USERNAME
:
${SEARCH_USERNAME:-fda}
SEARCH_PASSWORD
:
${SEARCH_PASSWORD:-fda}
LOG_LEVEL
:
${LOG_LEVEL:-debug}
healthcheck
:
test
:
wget -qO- localhost:9050/actuator/health/readiness | grep -q "UP" || exit
1
interval
:
10s
timeout
:
5s
retries
:
12
depends_on
:
dbrepo-metadata-db
:
condition
:
service_healthy
dbrepo-search-db
:
condition
:
service_started
dbrepo-authentication-service
:
condition
:
service_healthy
logging
:
driver
:
json-file
\ No newline at end of file
This diff is collapsed.
Click to expand it.
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