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
fffe82fe
Verified
Commit
fffe82fe
authored
1 year ago
by
Martin Weise
Browse files
Options
Downloads
Patches
Plain Diff
Re-added search db image
parent
4f15d94a
No related branches found
No related tags found
3 merge requests
!231
CI: Remove build for log-service
,
!228
Better error message handling in the frontend
,
!223
Release of version 1.4.0
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
Makefile
+2
-2
2 additions, 2 deletions
Makefile
docker-compose.yml
+31
-31
31 additions, 31 deletions
docker-compose.yml
with
33 additions
and
33 deletions
Makefile
+
2
−
2
View file @
fffe82fe
...
@@ -32,7 +32,7 @@ build-frontend:
...
@@ -32,7 +32,7 @@ build-frontend:
build-clients
:
build-clients
:
bash ./.gitlab/swagger/generate.sh
bash ./.gitlab/swagger/generate.sh
tag
:
tag-analyse-service tag-authentication-service tag-metadata-db tag-ui tag-broker-service tag-metadata-service tag-search-sync-agent tag-log-service
tag
:
tag-analyse-service tag-authentication-service tag-metadata-db tag-ui tag-broker-service tag-metadata-service tag-search-sync-agent tag-log-service
tag-search-db
tag-analyse-service
:
tag-analyse-service
:
docker tag dbrepo-analyse-service:latest
"dbrepo/analyse-service:
${
TAG
}
"
docker tag dbrepo-analyse-service:latest
"dbrepo/analyse-service:
${
TAG
}
"
...
@@ -70,7 +70,7 @@ tag-log-service:
...
@@ -70,7 +70,7 @@ tag-log-service:
docker tag dbrepo-log-service:latest
"dbrepo/log-service:
${
TAG
}
"
docker tag dbrepo-log-service:latest
"dbrepo/log-service:
${
TAG
}
"
docker tag dbrepo-log-service:latest
"
${
AZURE_REPO
}
/dbrepo/log-service:
${
TAG
}
"
docker tag dbrepo-log-service:latest
"
${
AZURE_REPO
}
/dbrepo/log-service:
${
TAG
}
"
release
:
build-docker tag release-analyse-service release-authentication-service release-metadata-db release-ui release-broker-service release-metadata-service release-search-sync-agent release-log-service
release
:
build-docker tag release-analyse-service release-authentication-service release-metadata-db release-ui release-broker-service release-metadata-service release-search-sync-agent release-log-service
release-search-db
release-analyse-service
:
tag-analyse-service
release-analyse-service
:
tag-analyse-service
docker push
"dbrepo/analyse-service:
${
TAG
}
"
docker push
"dbrepo/analyse-service:
${
TAG
}
"
...
...
This diff is collapsed.
Click to expand it.
docker-compose.yml
+
31
−
31
View file @
fffe82fe
...
@@ -351,34 +351,34 @@ services:
...
@@ -351,34 +351,34 @@ services:
dbrepo-search-db
:
dbrepo-search-db
:
condition
:
service_healthy
condition
:
service_healthy
dbrepo-search-sync-agent
:
# dbrepo-search-sync-agent:
restart
:
"
no"
# restart: "no"
container_name
:
dbrepo-search-sync-agent
# container_name: dbrepo-search-sync-agent
hostname
:
search-startup-agent
# hostname: search-startup-agent
build
:
./dbrepo-search-sync-agent
# build: ./dbrepo-search-sync-agent
image
:
dbrepo-search-sync-agent
# image: dbrepo-search-sync-agent
networks
:
# networks:
core
:
# core:
environment
:
# environment:
METADATA_DB
:
${METADATA_DB:-fda}
# METADATA_DB: ${METADATA_DB:-fda}
METADATA_HOST
:
${METADATA_HOST:-metadata-db}
# METADATA_HOST: ${METADATA_HOST:-metadata-db}
METADATA_JDBC_EXTRA_ARGS
:
${METADATA_JDBC_EXTRA_ARGS:-}
# METADATA_JDBC_EXTRA_ARGS: ${METADATA_JDBC_EXTRA_ARGS:-}
METADATA_PASSWORD
:
${METADATA_PASSWORD:-dbrepo}
# METADATA_PASSWORD: ${METADATA_PASSWORD:-dbrepo}
METADATA_USERNAME
:
${METADATA_USERNAME:-root}
# METADATA_USERNAME: ${METADATA_USERNAME:-root}
SEARCH_USERNAME
:
${SEARCH_USERNAME:-admin}
# SEARCH_USERNAME: ${SEARCH_USERNAME:-admin}
SEARCH_PASSWORD
:
${SEARCH_PASSWORD:-admin}
# SEARCH_PASSWORD: ${SEARCH_PASSWORD:-admin}
LOG_LEVEL
:
${LOG_LEVEL:-debug}
# LOG_LEVEL: ${LOG_LEVEL:-debug}
healthcheck
:
# healthcheck:
test
:
wget -qO- localhost:9050/actuator/health/readiness | grep -q "UP" || exit
1
# test: wget -qO- localhost:9050/actuator/health/readiness | grep -q "UP" || exit 1
interval
:
10s
# interval: 10s
timeout
:
5s
# timeout: 5s
retries
:
12
# retries: 12
depends_on
:
# depends_on:
dbrepo-metadata-db
:
# dbrepo-metadata-db:
condition
:
service_healthy
# condition: service_healthy
dbrepo-search-db
:
# dbrepo-search-db:
condition
:
service_started
# condition: service_started
dbrepo-authentication-service
:
# dbrepo-authentication-service:
condition
:
service_healthy
# condition: service_healthy
logging
:
# logging:
driver
:
json-file
# driver: json-file
\ No newline at end of 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