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

Revert "Merge branch '289-remove-old-queries' into 'master'" 

This reverts merge request !144
parent cd631d7e
No related branches found
No related tags found
1 merge request!145Revert "Merge branch '289-remove-old-queries' into 'master'"
Show whitespace changes
Inline Side-by-side
Showing
with 923 additions and 227 deletions
.dbrepo2/deploy 0 → 100755
+ 40
− 0
View file @ d8f80bf1
#!/bin/bash
# set version
TAG=latest
# tear everything down
echo "Removing all data ..."
/bin/bash teardown
docker system prune -f --volumes || true
echo "Pulling new images ..."
docker pull "dbrepo/analyse-service:${TAG}"
docker pull "dbrepo/authentication-service:${TAG}"
docker pull "dbrepo/metadata-db:${TAG}"
docker pull "dbrepo/ui:${TAG}"
docker pull "dbrepo/ui-proxy:${TAG}"
docker pull "dbrepo/identifier-service:${TAG}"
docker pull "dbrepo/container-service:${TAG}"
docker pull "dbrepo/database-service:${TAG}"
docker pull "dbrepo/discovery-service:${TAG}"
docker pull "dbrepo/gateway-service:${TAG}"
docker pull "dbrepo/query-service:${TAG}"
docker pull "dbrepo/table-service:${TAG}"
docker pull "dbrepo/units-service:${TAG}"
docker pull "dbrepo/broker-service:${TAG}"
docker pull "dbrepo/metadata-service:${TAG}"
echo "Pulled new images"
# deploy dbrepo
echo "Deploy DBRepo ..."
docker compose -f ./docker-compose.dbrepo2.yml up -d
# clone tuw specific deployment
git -C "/home/demo/dbrepo-tuw" pull || git clone ssh://git@gitlab.tuwien.ac.at:822/martin.weise/dbrepo-tuw.git "/home/demo/dbrepo-tuw"
cd /home/demo/dbrepo-tuw && git checkout dev
# build tuw specific deployment
docker compose -f /home/demo/dbrepo-tuw/docker-compose.dbrepo2.yml build || exit 3
docker compose -f /home/demo/dbrepo-tuw/docker-compose.dbrepo2.yml up -d || exit 4
echo "Deployed TU Wien specific deployment"
\ No newline at end of file
.dbrepo2/known_hosts 0 → 100644
+ 6
− 0
View file @ d8f80bf1
gitlab.tuwien.ac.at ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDKslN24njaMeH0xyVBO/lzeQ5/X/6UFkiz2qdcWihjT28slO/6pFBAxSzPUTBeVJWxKJgX9N+Hm65S9/Z2521E8Y9F56dcrOgeQBZ4GbLPSbEZIFN/71VL4cOh6tLahNZsAwd6y2Zi5XTAqho31VWfdCZkegZB3dNzLfOuC0t3KpxEAmWus5j8InNYDTBIy6U351/3h3oy32EdLvLpaHP+oy+QFAqXOlcXlKwHTfv9SSchQRLfWzrL4hVvohbCwMDBBvIP8J0WQ9mV95xfcwuipMWP3TksDGbst2MQ6HRXZ+yfie9Vgzg+++AjpHXQCMdalEmedNxCmxbHWYJxFHUV
gitlab.tuwien.ac.at ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBC+2QClFaM3ZNQ6nl3nHkZdFSyNP26uHPzJEUBu9J4yC1ON9GPHb2P3rC//wS819e3LWP4PXb8ug/EyEjWN30MA=
gitlab.tuwien.ac.at ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILTzOKU3zEYNo1xy8rxZsa8D0/y4EN4oB0E7wgWCkOpZ
dbrepo2.ec.tuwien.ac.at ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQC5GFfX4xmYeQdQQL81heBjKb4d1M8xjOjF4lpfNmc3/wyCPtP/dt4r3nkcOW3X14yPximy8BlArsPk4ul14BWNI9yrU5VA1FLlWq9Og6SfMJ1EAUNsePDd3qCpr/ljlydS3kWCVrXD1bNO0kQ3/36e9l64BDvZXyhI3n9DvkPO93n9xJ151IC9IwjnSzJQPghboUDRiYwT2B9wt+uC+k7tTV5tQH5kJk8fEa8nMyHOc8aD2miHubrcQJrYO/fv+vVxVWJKtSdz22wuvFnj8SfGClxbT8cfMo8X+LpIQOH8VYwIZVznuSlnNYOOYO6EGYyRnqud6oz0B5RUbwyeBhtAgZW1C1OXO9DVDLnazzFxJIzwhwyZCPurpLpP7bd6P+oFWy1A7bxIhfvdduEDE80vEOPrBl44TDe6RJR6QILtdUn9rrvcV/kgfj04zkQJjqMvX2pdCpdMIU1Pm+NQ53k3oOap7j9UHnpWX7C3mk76ueQddQxWZUhGsrFUAYSJfus=
dbrepo2.ec.tuwien.ac.at ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBOGTeKw2aKnykIUmvLiBNaGbq3xlSEsnD1M1HiZsPJ9ZtfSV12y9F0yutV4j68Rb+eHbyOxoyVekfl19ODDvXLM=
dbrepo2.ec.tuwien.ac.at ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPpSoshRRtQBj4ebWeaWoeGr1XFIlx3L+BXV69fafBGr
\ No newline at end of file
.junit/teardown → .dbrepo2/teardown
+ 0
− 0
View file @ d8f80bf1
File moved
.fda-deployment/clean 0 → 100755
+ 4
− 0
View file @ d8f80bf1
#!/bin/bash
docker container stop $(docker container ls -aq) || true
docker container rm $(docker container ls -aq) || true
docker volume rm $(docker volume ls -q) || true
.fda-deployment/clean-tmp 0 → 100755
+ 6
− 0
View file @ d8f80bf1
#!/bin/bash
FILES=$(cd /tmp && find -exec basename '{}' ';' 2>/dev/null | egrep '^.{32}$' | egrep "^([a-z0-9]+)$")
for file in $FILES; do
rm -f /tmp/$file
echo "Removed /tmp/${file}"
done
\ No newline at end of file
.fda-deployment/crontab 0 → 100644
+ 2
− 0
View file @ d8f80bf1
0 2 * * * /usr/bin/make -C /home/rocky/fda-services teardown
1 2 * * * /usr/bin/make -C /home/rocky/fda-services run
\ No newline at end of file
.fda-deployment/fda-authentication-service/install_cert 0 → 100755
+ 52
− 0
View file @ d8f80bf1
#!/bin/bash
TMP_CERT_LOCATION="/root/keys"
TMP_SAML_LOCATION="/root/keys"
KEY_STORE_LOCATION="/tmp/dbrepo.jks"
KEY_STORE_PASS="dbrepo"
CERT_LOCATION="/etc/letsencrypt/live/dbrepo.ossdip.at"
SAML_KEY="/root/keys/saml_sign.key"
SAML_PUB="/root/keys/saml_sign.cer"
TU_SAML_CERT="./fda-authentication-service/rest-service/src/main/resources/saml/tu.crt"
# PLACE
sudo mkdir -p "${TMP_CERT_LOCATION}"
sudo mkdir -p "${TMP_SAML_LOCATION}"
# REQUEST
sudo certbot certonly --standalone --preferred-challenges http -d dbrepo.ossdip.at \
-m martin.weise@tuwien.ac.at --agree-tos --keep-until-expiring
# CONVERT PKCS12
sudo openssl pkcs12 -export -out "${TMP_SAML_LOCATION}/saml.p12" -in "${SAML_PUB}" \
-inkey "${SAML_KEY}" -passout "pass:${KEY_STORE_PASS}"
# CONVERT PKCS12
sudo openssl pkcs12 -export -out "${TMP_CERT_LOCATION}/cert.p12" -in "${CERT_LOCATION}/cert.pem" \
-inkey "${CERT_LOCATION}/privkey.pem" -passout "pass:${KEY_STORE_PASS}"
# FIX PERMISSIONS
sudo chmod -R 644 "${TMP_CERT_LOCATION}"
sudo chmod -R 644 "${TMP_SAML_LOCATION}"
# IMPORT SSL SIGN PRIVKEY
sudo keytool -noprompt -importkeystore -deststorepass "${KEY_STORE_PASS}" -destkeypass "${KEY_STORE_PASS}" \
-destkeystore "${KEY_STORE_LOCATION}" -srckeystore "${TMP_CERT_LOCATION}/cert.p12" -srcstoretype PKCS12 \
-srcstorepass "${KEY_STORE_PASS}" -alias 1 -destalias ssl
# IMPORT SAML MESSAGE SIGN PRIVKEY
sudo keytool -noprompt -importkeystore -deststorepass "${KEY_STORE_PASS}" -destkeypass "${KEY_STORE_PASS}" \
-destkeystore "${KEY_STORE_LOCATION}" -srckeystore "${TMP_SAML_LOCATION}" -srcstoretype PKCS12 \
-srcstorepass "${KEY_STORE_PASS}" -alias 1 -destalias saml
# IMPORT METADATA VERIFICATION PUBKEY
sudo keytool -noprompt -importcert -file "${TU_SAML_CERT}" -storepass "${KEY_STORE_PASS}" \
-keystore "${KEY_STORE_LOCATION}" -alias tu
# OWNERSHIP
sudo chown centos:docker "${TMP_CERT_LOCATION}"
sudo chown centos:docker "${TMP_SAML_LOCATION}"
sudo chown centos:docker "${KEY_STORE_LOCATION}"
# TRUST LET'S ENCRYPT
sudo keytool -noprompt -import -alias letsencrypt -keystore "${KEY_STORE_LOCATION}" -storepass "${KEY_STORE_PASS}" \
-file "${CERT_LOCATION}/chain.pem"
.fda-deployment/fda-authentication-service/install_smtp 0 → 100755
+ 2
− 0
View file @ d8f80bf1
#!/bin/bash
sudo cat /root/smtp.secret >> ./.env
.fda-deployment/fda-ui/install_cert 0 → 100755
+ 12
− 0
View file @ d8f80bf1
#!/bin/bash
CA_PATH="/etc/letsencrypt/live/dbrepo.ossdip.at"
sudo certbot certonly --standalone --preferred-challenges http -d dbrepo.ossdip.at --agree-tos --keep-until-expiring
KEY=$(sudo sed -E ':a;N;$!ba;s/\r{0,1}\n/\\n/g' "${CA_PATH}/privkey.pem")
CERT=$(sudo sed -E ':a;N;$!ba;s/\r{0,1}\n/\\n/g' "${CA_PATH}/cert.pem")
cat << EOF
UI_KEY="${KEY}"
UI_CERT="${CERT}"
EOF
\ No newline at end of file
.fda-deployment/hosts 0 → 100644
+ 7
− 0
View file @ d8f80bf1
# FDA USERDB
172.28.0.2 fda-userdb-weather-aus
172.28.0.3 fda-userdb-infection
172.28.0.4 fda-userdb-air
172.28.0.5 fda-userdb-u01
172.28.0.6 fda-userdb-u02
172.28.0.7 fda-userdb-u03
\ No newline at end of file
.gitignore
+ 1
− 1
View file @ d8f80bf1
...@@ -3,7 +3,7 @@ target/ ...@@ -3,7 +3,7 @@ target/
!.mvn/wrapper/maven-wrapper.jar !.mvn/wrapper/maven-wrapper.jar
!**/src/main/**/target/ !**/src/main/**/target/
!**/src/test/**/target/ !**/src/test/**/target/
dbrepo-*
# Notebooks # Notebooks
.jupyter/ .jupyter/
.pytest_cache/ .pytest_cache/
......
.gitlab-ci.yml
+ 57
− 76
View file @ d8f80bf1
...@@ -5,6 +5,7 @@ before_script: ...@@ -5,6 +5,7 @@ before_script:
- "mvn --version" - "mvn --version"
- "python3 --version" - "python3 --version"
- "df / -h" - "df / -h"
- "grep -rnw '@Test' | wc -l"
variables: variables:
HOSTALIASES: ./hosts HOSTALIASES: ./hosts
...@@ -22,77 +23,76 @@ stages: ...@@ -22,77 +23,76 @@ stages:
- build-backend - build-backend
- build-frontend - build-frontend
- test-backend - test-backend
- test-frontend
- build-docker - build-docker
- release - release
build-metadata-db: build-backend-metadata-db:
stage: build-backend stage: build-backend
script: script:
- "make build-metadata-db" - "make build-backend-metadata-db"
build-authentication-service: build-backend-authentication:
stage: build-backend stage: build-backend
needs: needs:
- build-metadata-db - build-backend-metadata-db
script: script:
- "make build-authentication-service" - "make build-backend-authentication"
build-identifier-service: build-backend-identifier:
stage: build-backend stage: build-backend
needs: needs:
- build-metadata-db - build-backend-metadata-db
script: script:
- "make build-identifier-service" - "make build-backend-identifier"
build-container-service: build-backend-container:
stage: build-backend stage: build-backend
needs: needs:
- build-metadata-db - build-backend-metadata-db
script: script:
- "make build-container-service" - "make build-backend-container"
build-database-service: build-backend-database:
stage: build-backend stage: build-backend
needs: needs:
- build-metadata-db - build-backend-metadata-db
script: script:
- "make build-database-service" - "make build-backend-database"
build-discovery-service: build-backend-discovery:
stage: build-backend stage: build-backend
needs: needs:
- build-metadata-db - build-backend-metadata-db
script: script:
- "make build-discovery-service" - "make build-backend-discovery"
build-gateway-service: build-backend-gateway:
stage: build-backend stage: build-backend
needs: needs:
- build-metadata-db - build-backend-metadata-db
script: script:
- "make build-gateway-service" - "make build-backend-gateway"
build-query-service: build-backend-query:
stage: build-backend stage: build-backend
needs: needs:
- build-metadata-db - build-backend-metadata-db
script: script:
- "make build-query-service" - "make build-backend-query"
build-table-service: build-backend-table:
stage: build-backend stage: build-backend
needs: needs:
- build-metadata-db - build-backend-metadata-db
script: script:
- "make build-table-service" - "make build-backend-table"
build-metadata-service: build-backend-metadata:
stage: build-backend stage: build-backend
needs: needs:
- build-metadata-db - build-backend-metadata-db
script: script:
- "make build-metadata-service" - "make build-backend-metadata"
build-semantics-service: build-semantics-service:
stage: build-backend stage: build-backend
...@@ -107,7 +107,7 @@ build-analyse-service: ...@@ -107,7 +107,7 @@ build-analyse-service:
test-backend-authentication: test-backend-authentication:
stage: test-backend stage: test-backend
needs: needs:
- build-authentication-service - build-backend-authentication
script: script:
- "make test-authentication-service" - "make test-authentication-service"
- "cat ./fda-authentication-service/report/target/site/jacoco-aggregate/index.html | grep -o 'Total[^%]*%' | sed 's/<.*>/ /; s/Total/Jacoco Coverage Total:/'" - "cat ./fda-authentication-service/report/target/site/jacoco-aggregate/index.html | grep -o 'Total[^%]*%' | sed 's/<.*>/ /; s/Total/Jacoco Coverage Total:/'"
...@@ -120,11 +120,10 @@ test-backend-authentication: ...@@ -120,11 +120,10 @@ test-backend-authentication:
reports: reports:
junit: ./fda-authentication-service/rest-service/target/surefire-reports/TEST-*.xml junit: ./fda-authentication-service/rest-service/target/surefire-reports/TEST-*.xml
coverage: '/Total.*?([0-9]{1,3})%/' coverage: '/Total.*?([0-9]{1,3})%/'
test-backend-identifier:
test-identifier-service:
stage: test-backend stage: test-backend
needs: needs:
- build-authentication-service - build-backend-authentication
script: script:
- "make test-identifier-service" - "make test-identifier-service"
- "cat ./fda-identifier-service/report/target/site/jacoco-aggregate/index.html | grep -o 'Total[^%]*%' | sed 's/<.*>/ /; s/Total/Jacoco Coverage Total:/'" - "cat ./fda-identifier-service/report/target/site/jacoco-aggregate/index.html | grep -o 'Total[^%]*%' | sed 's/<.*>/ /; s/Total/Jacoco Coverage Total:/'"
...@@ -138,10 +137,10 @@ test-identifier-service: ...@@ -138,10 +137,10 @@ test-identifier-service:
junit: ./fda-identifier-service/rest-service/target/surefire-reports/TEST-*.xml junit: ./fda-identifier-service/rest-service/target/surefire-reports/TEST-*.xml
coverage: '/Total.*?([0-9]{1,3})%/' coverage: '/Total.*?([0-9]{1,3})%/'
test-container-service: test-backend-container:
stage: test-backend stage: test-backend
needs: needs:
- build-container-service - build-backend-container
script: script:
- "make test-container-service" - "make test-container-service"
- "cat ./fda-container-service/report/target/site/jacoco-aggregate/index.html | grep -o 'Total[^%]*%' | sed 's/<.*>/ /; s/Total/Jacoco Coverage Total:/'" - "cat ./fda-container-service/report/target/site/jacoco-aggregate/index.html | grep -o 'Total[^%]*%' | sed 's/<.*>/ /; s/Total/Jacoco Coverage Total:/'"
...@@ -155,10 +154,10 @@ test-container-service: ...@@ -155,10 +154,10 @@ test-container-service:
junit: ./fda-container-service/rest-service/target/surefire-reports/TEST-*.xml junit: ./fda-container-service/rest-service/target/surefire-reports/TEST-*.xml
coverage: '/Total.*?([0-9]{1,3})%/' coverage: '/Total.*?([0-9]{1,3})%/'
test-database-service: test-backend-database:
stage: test-backend stage: test-backend
needs: needs:
- build-database-service - build-backend-database
script: script:
- "docker pull elasticsearch:7.13.4" - "docker pull elasticsearch:7.13.4"
- "make test-database-service" - "make test-database-service"
...@@ -172,12 +171,11 @@ test-database-service: ...@@ -172,12 +171,11 @@ test-database-service:
reports: reports:
junit: ./fda-database-service/rest-service/target/surefire-reports/TEST-*.xml junit: ./fda-database-service/rest-service/target/surefire-reports/TEST-*.xml
coverage: '/Total.*?([0-9]{1,3})%/' coverage: '/Total.*?([0-9]{1,3})%/'
timeout: 2 hour
test-discovery-service: test-backend-discovery:
stage: test-backend stage: test-backend
needs: needs:
- build-discovery-service - build-backend-discovery
script: script:
- "make test-discovery-service" - "make test-discovery-service"
- "cat ./fda-discovery-service/report/target/site/jacoco-aggregate/index.html | grep -o 'Total[^%]*%' | sed 's/<.*>/ /; s/Total/Jacoco Coverage Total:/'" - "cat ./fda-discovery-service/report/target/site/jacoco-aggregate/index.html | grep -o 'Total[^%]*%' | sed 's/<.*>/ /; s/Total/Jacoco Coverage Total:/'"
...@@ -191,10 +189,10 @@ test-discovery-service: ...@@ -191,10 +189,10 @@ test-discovery-service:
junit: ./fda-discovery-service/discovery/target/surefire-reports/TEST-*.xml junit: ./fda-discovery-service/discovery/target/surefire-reports/TEST-*.xml
coverage: '/Total.*?([0-9]{1,3})%/' coverage: '/Total.*?([0-9]{1,3})%/'
test-query-service: test-backend-query:
stage: test-backend stage: test-backend
needs: needs:
- build-query-service - build-backend-query
script: script:
- "make test-query-service" - "make test-query-service"
- "cat ./fda-query-service/report/target/site/jacoco-aggregate/index.html | grep -o 'Total[^%]*%' | sed 's/<.*>/ /; s/Total/Jacoco Coverage Total:/'" - "cat ./fda-query-service/report/target/site/jacoco-aggregate/index.html | grep -o 'Total[^%]*%' | sed 's/<.*>/ /; s/Total/Jacoco Coverage Total:/'"
...@@ -207,12 +205,11 @@ test-query-service: ...@@ -207,12 +205,11 @@ test-query-service:
reports: reports:
junit: ./fda-query-service/rest-service/target/surefire-reports/TEST-*.xml junit: ./fda-query-service/rest-service/target/surefire-reports/TEST-*.xml
coverage: '/Total.*?([0-9]{1,3})%/' coverage: '/Total.*?([0-9]{1,3})%/'
timeout: 2 hour
test-table-service: test-backend-table:
stage: test-backend stage: test-backend
needs: needs:
- build-table-service - build-backend-table
script: script:
- "make test-table-service" - "make test-table-service"
- "cat ./fda-table-service/report/target/site/jacoco-aggregate/index.html | grep -o 'Total[^%]*%' | sed 's/<.*>/ /; s/Total/Jacoco Coverage Total:/'" - "cat ./fda-table-service/report/target/site/jacoco-aggregate/index.html | grep -o 'Total[^%]*%' | sed 's/<.*>/ /; s/Total/Jacoco Coverage Total:/'"
...@@ -226,10 +223,10 @@ test-table-service: ...@@ -226,10 +223,10 @@ test-table-service:
junit: ./fda-table-service/rest-service/target/surefire-reports/TEST-*.xml junit: ./fda-table-service/rest-service/target/surefire-reports/TEST-*.xml
coverage: '/Total.*?([0-9]{1,3})%/' coverage: '/Total.*?([0-9]{1,3})%/'
test-metadata-service: test-backend-metadata:
stage: test-backend stage: test-backend
needs: needs:
- build-metadata-service - build-backend-metadata
script: script:
- "make test-metadata-service" - "make test-metadata-service"
- "cat ./fda-metadata-service/report/target/site/jacoco-aggregate/index.html | grep -o 'Total[^%]*%' | sed 's/<.*>/ /; s/Total/Jacoco Coverage Total:/'" - "cat ./fda-metadata-service/report/target/site/jacoco-aggregate/index.html | grep -o 'Total[^%]*%' | sed 's/<.*>/ /; s/Total/Jacoco Coverage Total:/'"
...@@ -243,10 +240,10 @@ test-metadata-service: ...@@ -243,10 +240,10 @@ test-metadata-service:
junit: ./fda-metadata-service/rest-service/target/surefire-reports/TEST-*.xml junit: ./fda-metadata-service/rest-service/target/surefire-reports/TEST-*.xml
coverage: '/Total.*?([0-9]{1,3})%/' coverage: '/Total.*?([0-9]{1,3})%/'
test-gateway-service: test-backend-gateway:
stage: test-backend stage: test-backend
needs: needs:
- build-gateway-service - build-backend-gateway
script: script:
- "make test-gateway-service" - "make test-gateway-service"
- "cat ./fda-gateway-service/report/target/site/jacoco-aggregate/index.html | grep -o 'Total[^%]*%' | sed 's/<.*>/ /; s/Total/Jacoco Coverage Total:/'" - "cat ./fda-gateway-service/report/target/site/jacoco-aggregate/index.html | grep -o 'Total[^%]*%' | sed 's/<.*>/ /; s/Total/Jacoco Coverage Total:/'"
...@@ -292,35 +289,19 @@ test-analyse-service: ...@@ -292,35 +289,19 @@ test-analyse-service:
junit: ./fda-analyse-service/report.xml junit: ./fda-analyse-service/report.xml
coverage: '/TOTAL.*?([0-9]{1,3})%/' coverage: '/TOTAL.*?([0-9]{1,3})%/'
test-frontend:
stage: test-frontend
needs:
- build-frontend
script:
- "make test-frontend"
- "cat ./fda-ui/coverage.txt | grep -o 'Lines[^%]*%'"
artifacts:
when: always
paths:
- ./fda-analyse-service/report.xml
expire_in: 1 days
reports:
junit: ./fda-analyse-service/report.xml
coverage: '/TOTAL.*?([0-9]{1,3})%/'
build-docker: build-docker:
stage: build-docker stage: build-docker
needs: needs:
- build-metadata-db - build-backend-metadata-db
- build-authentication-service - build-backend-authentication
- build-identifier-service - build-backend-identifier
- build-container-service - build-backend-container
- build-database-service - build-backend-database
- build-discovery-service - build-backend-discovery
- build-gateway-service - build-backend-gateway
- build-query-service - build-backend-query
- build-table-service - build-backend-table
- build-metadata-service - build-backend-metadata
- build-semantics-service - build-semantics-service
- build-analyse-service - build-analyse-service
script: script:
......
.gitlab/jacoco2cobertura.py 0 → 100755
+ 155
− 0
View file @ d8f80bf1
#!/usr/bin/env python3
import sys
import xml.etree.ElementTree as ET
import re
import os.path
# branch-rate="0.0" complexity="0.0" line-rate="1.0"
# branch="true" hits="1" number="86"
def find_lines(j_package, filename):
"""Return all <line> elements for a given source file in a package."""
lines = list()
sourcefiles = j_package.findall("sourcefile")
for sourcefile in sourcefiles:
if sourcefile.attrib.get("name") == os.path.basename(filename):
lines = lines + sourcefile.findall("line")
return lines
def line_is_after(jm, start_line):
return int(jm.attrib.get('line', 0)) > start_line
def method_lines(jmethod, jmethods, jlines):
"""Filter the lines from the given set of jlines that apply to the given jmethod."""
start_line = int(jmethod.attrib.get('line', 0))
larger = list(int(jm.attrib.get('line', 0)) for jm in jmethods if line_is_after(jm, start_line))
end_line = min(larger) if len(larger) else 99999999
for jline in jlines:
if start_line <= int(jline.attrib['nr']) < end_line:
yield jline
def convert_lines(j_lines, into):
"""Convert the JaCoCo <line> elements into Cobertura <line> elements, add them under the given element."""
c_lines = ET.SubElement(into, 'lines')
for jline in j_lines:
mb = int(jline.attrib['mb'])
cb = int(jline.attrib['cb'])
ci = int(jline.attrib['ci'])
cline = ET.SubElement(c_lines, 'line')
cline.set('number', jline.attrib['nr'])
cline.set('hits', '1' if ci > 0 else '0') # Probably not true but no way to know from JaCoCo XML file
if mb + cb > 0:
percentage = str(int(100 * (float(cb) / (float(cb) + float(mb))))) + '%'
cline.set('branch', 'true')
cline.set('condition-coverage', percentage + ' (' + str(cb) + '/' + str(cb + mb) + ')')
cond = ET.SubElement(ET.SubElement(cline, 'conditions'), 'condition')
cond.set('number', '0')
cond.set('type', 'jump')
cond.set('coverage', percentage)
else:
cline.set('branch', 'false')
def guess_filename(path_to_class):
m = re.match('([^$]*)', path_to_class)
return (m.group(1) if m else path_to_class) + '.java'
def add_counters(source, target):
target.set('line-rate', counter(source, 'LINE'))
target.set('branch-rate', counter(source, 'BRANCH'))
target.set('complexity', counter(source, 'COMPLEXITY', sum))
def fraction(covered, missed):
return covered / (covered + missed)
def sum(covered, missed):
return covered + missed
def counter(source, type, operation=fraction):
cs = source.findall('counter')
c = next((ct for ct in cs if ct.attrib.get('type') == type), None)
if c is not None:
covered = float(c.attrib['covered'])
missed = float(c.attrib['missed'])
return str(operation(covered, missed))
else:
return '0.0'
def convert_method(j_method, j_lines):
c_method = ET.Element('method')
c_method.set('name', j_method.attrib['name'])
c_method.set('signature', j_method.attrib['desc'])
add_counters(j_method, c_method)
convert_lines(j_lines, c_method)
return c_method
def convert_class(j_class, j_package):
c_class = ET.Element('class')
c_class.set('name', j_class.attrib['name'].replace('/', '.'))
c_class.set('filename', guess_filename(j_class.attrib['name']))
all_j_lines = list(find_lines(j_package, c_class.attrib['filename']))
c_methods = ET.SubElement(c_class, 'methods')
all_j_methods = list(j_class.findall('method'))
for j_method in all_j_methods:
j_method_lines = method_lines(j_method, all_j_methods, all_j_lines)
c_methods.append(convert_method(j_method, j_method_lines))
add_counters(j_class, c_class)
convert_lines(all_j_lines, c_class)
return c_class
def convert_package(j_package):
c_package = ET.Element('package')
c_package.attrib['name'] = j_package.attrib['name'].replace('/', '.')
c_classes = ET.SubElement(c_package, 'classes')
for j_class in j_package.findall('class'):
c_classes.append(convert_class(j_class, j_package))
add_counters(j_package, c_package)
return c_package
def convert_root(source, target, source_roots):
target.set('timestamp', str(int(source.find('sessioninfo').attrib['start']) / 1000))
sources = ET.SubElement(target, 'sources')
for s in source_roots:
ET.SubElement(sources, 'source').text = s
packages = ET.SubElement(target, 'packages')
for package in source.findall('package'):
packages.append(convert_package(package))
add_counters(source, target)
def jacoco2cobertura(filename, source_roots):
if filename == '-':
root = ET.fromstring(sys.stdin.read())
else:
tree = ET.parse(filename)
root = tree.getroot()
into = ET.Element('coverage')
convert_root(root, into, source_roots)
print(ET.tostring(into, encoding='utf8', method='xml').decode("utf-8"))
if __name__ == '__main__':
if len(sys.argv) < 2:
print("Usage: cover2cover.py FILENAME [SOURCE_ROOTS]")
sys.exit(1)
filename = sys.argv[1]
source_roots = sys.argv[2:] if 2 < len(sys.argv) else '.'
jacoco2cobertura(filename, source_roots)
\ No newline at end of file
.gitlab/tests/test_containers.py 0 → 100644
+ 97
− 0
View file @ d8f80bf1
#!/bin/env python3
from api_container.api.container_endpoint_api import ContainerEndpointApi
from api_database.api.database_endpoint_api import DatabaseEndpointApi
import time
container = ContainerEndpointApi()
database = DatabaseEndpointApi()
def create_container():
response = container.create1({
"name": "Pilot Factory Data",
"repository": "mariadb",
"tag": "10.5"
})
print("created container with id %d" % response.id)
return response
def start_container(container_id):
response = container.modify({
"action": "start"
}, container_id)
print("... starting")
time.sleep(5)
print("started container with id %d" % response.id)
return response
def create_database(container_id, is_public=True):
response = database.create({
"name": "Pilot Factory Data",
"is_public": is_public
}, container_id)
print("created database with id %d" % response.id)
return response
token = "" # keep
from api_authentication.api.authentication_endpoint_api import AuthenticationEndpointApi
from api_authentication.api.user_endpoint_api import UserEndpointApi
import uuid
authentication = AuthenticationEndpointApi()
user = UserEndpointApi()
def create_user(username):
response = user.register({
"username": username,
"password": username,
"email": username + "@gmail.com"
})
print("created user with id %d" % response.id)
return response
def auth_user(username):
response = authentication.authenticate_user1({
"username": username,
"password": username
})
print("authenticated user with id %d" % response.id)
token = response.token
container.api_client.default_headers = {"Authorization": "Bearer " + token}
database.api_client.default_headers = {"Authorization": "Bearer " + token}
return response
def find_database(container_id, database_id):
response = database.find_by_id(container_id, database_id)
print("found database with id %d" % response.id)
return response
def update_database(container_id, database_id):
response = database.update({
"description": "This dataset includes daily values from 1983 to the current day, divided into annual files. This includes the maximum hourly average and the number of times the hourly average limit value for ozone was exceeded and the daily averages for sulfur dioxide (SO2), carbon monoxide (CO), nitrogen oxide (NOx), nitrogen monoxide (NO), nitrogen dioxide (NO2), particulate matter (PM10 and PM2.5). ) and particle number (PN), provided that they are of sufficient quality. The values of the completed day for the current year are updated every 30 minutes after midnight (UTC+1).",
"publisher": "Technical University of Vienna",
"license": {
"identifier": "CC0-1.0",
"uri": "https://creativecommons.org/publicdomain/zero/1.0/legalcode"
},
"language": "en",
"publication_year": 2022
}, container_id, database_id)
print("updated database with id %d" % response.id)
return response
def test_containers():
username = str(uuid.uuid1()).replace("-", "")
uid = create_user(username).id
auth_user(username)
# container 1
cid = create_container().id
start_container(cid)
dbid = create_database(cid).id
update_database(cid, dbid)
.gitlab/tests/test_query.py 0 → 100644
+ 284
− 0
View file @ d8f80bf1
#!/bin/env python3
import time
import os
import shutil
import uuid
from api_authentication.api.authentication_endpoint_api import AuthenticationEndpointApi
from api_authentication.api.user_endpoint_api import UserEndpointApi
from api_container.api.container_endpoint_api import ContainerEndpointApi
from api_database.api.database_endpoint_api import DatabaseEndpointApi
from api_table.api.table_endpoint_api import TableEndpointApi
from api_query.api.table_data_endpoint_api import TableDataEndpointApi
from api_query.api.query_endpoint_api import QueryEndpointApi
from api_query.api.table_history_endpoint_api import TableHistoryEndpointApi
from api_identifier.api.identifier_endpoint_api import IdentifierEndpointApi
from api_identifier.api.persistence_endpoint_api import PersistenceEndpointApi
from api_query.api.view_endpoint_api import ViewEndpointApi
from api_query.rest import ApiException
authentication = AuthenticationEndpointApi()
user = UserEndpointApi()
container = ContainerEndpointApi()
database = DatabaseEndpointApi()
table = TableEndpointApi()
query = QueryEndpointApi()
history = TableHistoryEndpointApi()
data = TableDataEndpointApi()
identifier = IdentifierEndpointApi()
persistence = PersistenceEndpointApi()
view = ViewEndpointApi()
token = "" # keep
def create_user(username):
response = user.register({
"username": username,
"password": username,
"email": username + "@gmail.com"
})
print("created user with id %d" % response.id)
return response
def update_password(user_id, password):
response = user.update_password({
"password": password
}, user_id)
print("updated password for user with id %d" % user_id)
return response
def auth_user(username):
response = authentication.authenticate_user1({
"username": username,
"password": username
})
print("authenticated user with id %d" % response.id)
token = response.token
container.api_client.default_headers = {"Authorization": "Bearer " + token}
database.api_client.default_headers = {"Authorization": "Bearer " + token}
table.api_client.default_headers = {"Authorization": "Bearer " + token}
data.api_client.default_headers = {"Authorization": "Bearer " + token}
query.api_client.default_headers = {"Authorization": "Bearer " + token}
identifier.api_client.default_headers = {"Authorization": "Bearer " + token}
user.api_client.default_headers = {"Authorization": "Bearer " + token}
persistence.api_client.default_headers = {"Authorization": "Bearer " + token}
history.api_client.default_headers = {"Authorization": "Bearer " + token}
view.api_client.default_headers = {"Authorization": "Bearer " + token}
return response
def create_container():
response = container.create1({
"name": "Pilot Factory Data",
"repository": "mariadb",
"tag": "10.5"
})
print("created container with id %d" % response.id)
return response
def start_container(container_id):
response = container.modify({
"action": "start"
}, container_id)
print("... starting")
time.sleep(5)
print("started container with id %d" % response.id)
return response
def create_database(container_id, is_public=True):
response = database.create({
"name": "Pilot Factory Data",
"is_public": is_public
}, container_id)
print("created database with id %d" % response.id)
return response
def find_database(container_id, database_id):
response = database.find_by_id(container_id, database_id)
print("found database with id %d" % response.id)
return response
def update_database(container_id, database_id):
response = database.update({
"description": "This dataset includes daily values from 1983 to the current day, divided into annual files. This includes the maximum hourly average and the number of times the hourly average limit value for ozone was exceeded and the daily averages for sulfur dioxide (SO2), carbon monoxide (CO), nitrogen oxide (NOx), nitrogen monoxide (NO), nitrogen dioxide (NO2), particulate matter (PM10 and PM2.5). ) and particle number (PN), provided that they are of sufficient quality. The values of the completed day for the current year are updated every 30 minutes after midnight (UTC+1).",
"publisher": "Technical University of Vienna",
"license": {
"identifier": "CC0-1.0",
"uri": "https://creativecommons.org/publicdomain/zero/1.0/legalcode"
},
"language": "en",
"publication_year": 2022
}, container_id, database_id)
print("updated database with id %d" % response.id)
return response
def create_table(container_id, database_id, columns=None):
if columns is None:
columns = [{
"name": "Date",
"type": "date",
"dfid": 1,
"unique": False,
"primary_key": False,
"null_allowed": True,
}, {
"name": "Location",
"type": "string",
"unique": False,
"primary_key": False,
"null_allowed": True,
}, {
"name": "Parameter",
"type": "string",
"unique": False,
"primary_key": False,
"null_allowed": True,
}, {
"name": "Interval",
"type": "string",
"unique": False,
"primary_key": False,
"null_allowed": True,
}, {
"name": "Unit",
"type": "string",
"unique": False,
"primary_key": False,
"null_allowed": True,
}, {
"name": "Value",
"type": "decimal",
"unique": False,
"primary_key": False,
"null_allowed": True,
}, {
"name": "Status",
"type": "string",
"unique": False,
"primary_key": False,
"null_allowed": True,
}]
response = table.create({
"name": "Airquality " + str(uuid.uuid1()),
"description": "Airquality in Zürich, Switzerland",
"columns": columns
}, "Bearer " + token, container_id, database_id)
print("created table with id %d" % response.id)
return response
def find_table(container_id, database_id, table_id):
response = table.find_by_id(container_id, database_id, table_id)
print("found table with id %d" % response.id)
return response
def fill_table(container_id, database_id, table_id):
response = data.import_csv({
"location": "/path/to/data.csv",
"quote": "\"",
"null_element": "NA"
"separator": ",",
}, container_id, database_id, table_id)
print("filled table with id %d" % table_id)
return response
def create_query(container_id, database_id, statement, page=0, size=3):
response = query.execute({
"statement": statement
}, container_id, database_id, page=page, size=size)
print("executed query with id %d" % response.id)
return response
def delete_tuple(container_id, database_id, table_id, keys):
response = data.delete(keys, container_id, database_id, table_id)
print("deleted tuples for table with id %d" % table_id)
return response
def download_query_data(container_id, database_id, query_id):
response = query.export1(container_id, database_id, query_id)
print("downloaded query data for query with id %d" % query_id)
return response
def list_views(container_id, database_id):
response = view.find_all(container_id, database_id)
print("list views for database with id %d" % database_id)
return response
def create_view(container_id, database_id, table_name):
response = view.create({
"name": "Air Quality " + str(uuid.uuid1()),
"query": "SELECT `date`, `parameter`, `value` FROM `" + table_name + "` WHERE `date` = '2021-10-02T14:00'",
"is_public": True
}, container_id, database_id)
print("created view with id %d" % response.id)
return response
def data_view(container_id, database_id, view_id):
response = view.data(container_id, database_id, view_id)
print("retrieved data for view with id %d" % response.id)
return response
def test_identifiers():
#
# create 1 user and 2 containers (public, private)
#
username = str(uuid.uuid1()).replace("-", "")
uid = create_user(username).id
auth_user(username)
# container 1
cid = create_container().id
start_container(cid)
dbid = create_database(cid).id
update_database(cid, dbid)
tid = create_table(cid, dbid).id
tname = find_table(cid, dbid, tid).internal_name
fill_table(cid, dbid, tid)
create_query(cid, dbid, "select `id` from `" + tname + "`")
create_query(cid, dbid, "select `date` from `" + tname + "`")
qid = create_query(cid, dbid, "select `date`, `location`, `status` from `" + tname + "`").id
create_query(cid, dbid, "select `date`, `location`, `status` from `" + tname + "` order by `date` asc")
create_query(cid, dbid, "select t.`date`, t.location, t.status from `" + tname + "` t group by t.`date` order by t.`date` asc")
create_query(cid, dbid, "select `date`, `location`, `status` from `" + tname + "` group by `date`, `location` asc")
download_query_data(cid, dbid, qid)
# container 2 (=private)
cid = create_container().id
start_container(cid)
dbid = create_database(cid, False).id
update_database(cid, dbid)
tid = create_table(cid, dbid).id
tname = find_table(cid, dbid, tid).internal_name
fill_table(cid, dbid, tid)
qid = create_query(cid, dbid, "select `id` from `" + tname + "`").id
qid = create_query(cid, dbid, "select `id` from `" + tname + "`").id
vid = create_view(cid, dbid, tname).id
data_view(cid, dbid, vid)
list_views(cid, dbid)
for i in range(5, 10):
delete_tuple(cid, dbid, tid, {
"keys": {
"id": i
}
})
time.sleep(1)
delete_tuple(cid, dbid, tid, {
"keys": {
"location": "Schimmelstrasse"
}
})
.junit/hosts deleted 100644 → 0
+ 0
− 10
View file @ cd631d7e
###########################################################
# PLACE IN /etc/hosts #
###########################################################
172.30.0.5 dbrepo-userdb-u01
172.30.0.6 dbrepo-userdb-u02
172.30.0.7 dbrepo-userdb-u03
172.30.0.8 dbrepo-userdb-u04
172.31.0.2 dbrepo-broker-service
172.31.0.3 dbrepo-search-service
\ No newline at end of file
Makefile
+ 85
− 27
View file @ d8f80bf1
...@@ -4,36 +4,39 @@ TAG ?= latest ...@@ -4,36 +4,39 @@ TAG ?= latest
all: all:
build-backend: build-metadata-db build-database-service build-query-service build-table-service build-identifier-service build-authentication-service build-container-service build-discovery-service build-gateway-service build-metadata-service build-analyse-service clean:
bash ./.dbrepo2/clean.sh
build-backend: build-backend-metadata-db build-backend-database build-backend-query build-backend-table build-backend-identifier build-backend-authentication build-backend-container build-backend-discovery build-backend-gateway build-backend-metadata build-analyse-service
build-metadata-db: build-backend-metadata-db:
mvn -f ./fda-metadata-db/pom.xml clean install mvn -f ./fda-metadata-db/pom.xml clean install
build-authentication-service: build-metadata-db build-backend-authentication: build-backend-metadata-db
mvn -f ./fda-authentication-service/pom.xml clean package -DskipTests mvn -f ./fda-authentication-service/pom.xml clean package -DskipTests
build-identifier-service: build-metadata-db build-backend-identifier: build-backend-metadata-db
mvn -f ./fda-identifier-service/pom.xml clean package -DskipTests mvn -f ./fda-identifier-service/pom.xml clean package -DskipTests
build-table-service: build-metadata-db build-backend-table: build-backend-metadata-db
mvn -f ./fda-table-service/pom.xml clean package -DskipTests mvn -f ./fda-table-service/pom.xml clean package -DskipTests
build-container-service: build-metadata-db build-backend-container: build-backend-metadata-db
mvn -f ./fda-container-service/pom.xml clean package -DskipTests mvn -f ./fda-container-service/pom.xml clean package -DskipTests
build-database-service: build-metadata-db build-backend-database: build-backend-metadata-db
mvn -f ./fda-database-service/pom.xml clean package -DskipTests mvn -f ./fda-database-service/pom.xml clean package -DskipTests
build-discovery-service: build-metadata-db build-backend-discovery: build-backend-metadata-db
mvn -f ./fda-discovery-service/pom.xml clean package -DskipTests mvn -f ./fda-discovery-service/pom.xml clean package -DskipTests
build-gateway-service: build-metadata-db build-backend-gateway: build-backend-metadata-db
mvn -f ./fda-gateway-service/pom.xml clean package -DskipTests mvn -f ./fda-gateway-service/pom.xml clean package -DskipTests
build-query-service: build-metadata-db build-backend-query: build-backend-metadata-db
mvn -f ./fda-query-service/pom.xml clean package -DskipTests mvn -f ./fda-query-service/pom.xml clean package -DskipTests
build-metadata-service: build-metadata-db build-backend-metadata: build-backend-metadata-db
mvn -f ./fda-metadata-service/pom.xml clean package -DskipTests mvn -f ./fda-metadata-service/pom.xml clean package -DskipTests
build-semantics-service: build-semantics-service:
...@@ -147,35 +150,93 @@ release-search: ...@@ -147,35 +150,93 @@ release-search:
release-metadata: release-metadata:
docker push "dbrepo/metadata-service:${TAG}" docker push "dbrepo/metadata-service:${TAG}"
pull: pull-identifier pull-container pull-search pull-database pull-discovery pull-gateway pull-query pull-table pull-analyse pull-authentication pull-metadata-db pull-ui pull-units pull-broker pull-metadata
pull-analyse:
docker pull "dbrepo/analyse-service:${TAG}"
pull-authentication:
docker pull "dbrepo/authentication-service:${TAG}"
pull-metadata-db:
docker pull "dbrepo/metadata-db:${TAG}"
pull-ui:
docker pull "dbrepo/ui:${TAG}"
pull-identifier:
docker pull "dbrepo/identifier-service:${TAG}"
pull-container:
docker pull "dbrepo/container-service:${TAG}"
pull-database:
docker pull "dbrepo/database-service:${TAG}"
pull-discovery:
docker pull "dbrepo/discovery-service:${TAG}"
pull-gateway:
docker pull "dbrepo/gateway-service:${TAG}"
pull-query:
docker pull "dbrepo/query-service:${TAG}"
pull-table:
docker pull "dbrepo/table-service:${TAG}"
pull-units:
docker pull "dbrepo/semantics-service:${TAG}"
pull-broker:
docker pull "dbrepo/broker-service:${TAG}"
pull-metadata:
docker pull "dbrepo/metadata-service:${TAG}"
pull-search:
docker pull "dbrepo/search-service:${TAG}"
test-backend: test-authentication-service test-container-service test-database-service test-discovery-service test-gateway-service test-query-service test-table-service test-identifier-service test-metadata-service test-semantics-service test-analyse-service test-backend: test-authentication-service test-container-service test-database-service test-discovery-service test-gateway-service test-query-service test-table-service test-identifier-service test-metadata-service test-semantics-service test-analyse-service
test-authentication-service: clean build-metadata-db build-authentication-service test-authentication-service: build-backend-metadata-db build-backend-authentication
docker system prune -f --volumes
docker pull rabbitmq:3-management-alpine docker pull rabbitmq:3-management-alpine
mvn -f ./fda-authentication-service/pom.xml clean test verify mvn -f ./fda-authentication-service/pom.xml clean test verify
test-identifier-service: clean build-metadata-db build-identifier-service test-identifier-service: build-backend-metadata-db build-backend-identifier
docker system prune -f --volumes
mvn -f ./fda-identifier-service/pom.xml clean test verify mvn -f ./fda-identifier-service/pom.xml clean test verify
test-container-service: clean build-metadata-db build-container-service test-container-service: build-backend-metadata-db build-backend-container
docker system prune -f --volumes
docker pull mysql:8.0
mvn -f ./fda-container-service/pom.xml clean test verify mvn -f ./fda-container-service/pom.xml clean test verify
test-database-service: clean build-metadata-db build-database-service test-database-service: build-backend-metadata-db build-backend-database
docker system prune -f --volumes
docker pull rabbitmq:3-management-alpine docker pull rabbitmq:3-management-alpine
docker pull nginx:alpine
mvn -f ./fda-database-service/pom.xml clean test verify mvn -f ./fda-database-service/pom.xml clean test verify
test-discovery-service: clean build-metadata-db build-discovery-service test-discovery-service: build-backend-metadata-db build-backend-discovery
docker system prune -f --volumes
mvn -f ./fda-discovery-service/pom.xml clean test verify mvn -f ./fda-discovery-service/pom.xml clean test verify
test-gateway-service: clean build-metadata-db build-gateway-service test-gateway-service: build-backend-metadata-db build-backend-gateway
docker system prune -f --volumes
mvn -f ./fda-gateway-service/pom.xml clean test verify mvn -f ./fda-gateway-service/pom.xml clean test verify
test-query-service: clean build-metadata-db build-query-service test-query-service: build-backend-metadata-db build-backend-query
docker system prune -f --volumes
mvn -f ./fda-query-service/pom.xml clean test verify mvn -f ./fda-query-service/pom.xml clean test verify
test-table-service: clean build-metadata-db build-table-service test-table-service: build-backend-metadata-db build-backend-table
docker system prune -f --volumes
mvn -f ./fda-table-service/pom.xml clean test verify mvn -f ./fda-table-service/pom.xml clean test verify
test-metadata-service: clean build-metadata-db build-metadata-service test-metadata-service: build-backend-metadata-db build-backend-metadata
docker system prune -f --volumes
mvn -f ./fda-metadata-service/pom.xml clean test verify mvn -f ./fda-metadata-service/pom.xml clean test verify
test-semantics-service: build-semantics-service test-semantics-service: build-semantics-service
...@@ -184,16 +245,13 @@ test-semantics-service: build-semantics-service ...@@ -184,16 +245,13 @@ test-semantics-service: build-semantics-service
test-analyse-service: build-analyse-service test-analyse-service: build-analyse-service
bash ./fda-analyse-service/test.sh bash ./fda-analyse-service/test.sh
coverage-frontend: build-frontend coverage-frontend: clean build-frontend
yarn --cwd ./fda-ui run coverage || true yarn --cwd ./fda-ui run coverage || true
test-frontend: clean build-frontend test-frontend: clean build-frontend
yarn --cwd ./fda-ui install yarn --cwd ./fda-ui install
yarn --cwd ./fda-ui run test:unit || true docker compose up -d
yarn --cwd ./fda-ui run coverage || true yarn --cwd ./fda-ui run test
clean:
docker system prune -f --volumes
test-clients: test-clients:
bash ./.gitlab/test.sh bash ./.gitlab/test.sh
...@@ -201,4 +259,4 @@ test-clients: ...@@ -201,4 +259,4 @@ test-clients:
test: test-backend test-frontend test: test-backend test-frontend
teardown: teardown:
./.junit/teardown ./.dbrepo2/teardown
docker-compose.dbrepo1.yml
+ 37
− 37
View file @ d8f80bf1
...@@ -31,7 +31,7 @@ networks: ...@@ -31,7 +31,7 @@ networks:
services: services:
dbrepo-metadata-db: metadata-db:
restart: on-failure restart: on-failure
container_name: dbrepo-metadata-db container_name: dbrepo-metadata-db
hostname: metadata-db hostname: metadata-db
...@@ -60,7 +60,7 @@ services: ...@@ -60,7 +60,7 @@ services:
logging: logging:
driver: json-file driver: json-file
dbrepo-gateway-service: gateway-service:
restart: on-failure restart: on-failure
container_name: dbrepo-gateway-service container_name: dbrepo-gateway-service
hostname: gateway-service hostname: gateway-service
...@@ -72,12 +72,12 @@ services: ...@@ -72,12 +72,12 @@ services:
env_file: env_file:
- .env - .env
depends_on: depends_on:
dbrepo-discovery-service: discovery-service:
condition: service_healthy condition: service_healthy
logging: logging:
driver: json-file driver: json-file
dbrepo-database-service: database-service:
restart: on-failure restart: on-failure
container_name: dbrepo-database-service container_name: dbrepo-database-service
hostname: database-service hostname: database-service
...@@ -90,16 +90,16 @@ services: ...@@ -90,16 +90,16 @@ services:
volumes: volumes:
- /var/run/docker.sock:/var/run/docker.sock - /var/run/docker.sock:/var/run/docker.sock
depends_on: depends_on:
dbrepo-container-service: container-service:
condition: service_healthy condition: service_healthy
dbrepo-broker-service: broker-service:
condition: service_started condition: service_started
dbrepo-authentication-service: authentication-service:
condition: service_healthy condition: service_healthy
logging: logging:
driver: json-file driver: json-file
dbrepo-container-service: container-service:
restart: on-failure restart: on-failure
container_name: dbrepo-container-service container_name: dbrepo-container-service
hostname: container-service hostname: container-service
...@@ -111,12 +111,12 @@ services: ...@@ -111,12 +111,12 @@ services:
volumes: volumes:
- /var/run/docker.sock:/var/run/docker.sock - /var/run/docker.sock:/var/run/docker.sock
depends_on: depends_on:
dbrepo-authentication-service: authentication-service:
condition: service_healthy condition: service_healthy
logging: logging:
driver: json-file driver: json-file
dbrepo-authentication-service: authentication-service:
restart: on-failure restart: on-failure
container_name: dbrepo-authentication-service container_name: dbrepo-authentication-service
hostname: authentication-service hostname: authentication-service
...@@ -126,16 +126,16 @@ services: ...@@ -126,16 +126,16 @@ services:
env_file: env_file:
- .env - .env
depends_on: depends_on:
dbrepo-discovery-service: discovery-service:
condition: service_healthy condition: service_healthy
dbrepo-broker-service: broker-service:
condition: service_started condition: service_started
dbrepo-metadata-db: metadata-db:
condition: service_healthy condition: service_healthy
logging: logging:
driver: json-file driver: json-file
dbrepo-query-service: query-service:
restart: on-failure restart: on-failure
container_name: dbrepo-query-service container_name: dbrepo-query-service
hostname: query-service hostname: query-service
...@@ -148,14 +148,14 @@ services: ...@@ -148,14 +148,14 @@ services:
volumes: volumes:
- ${SHARED_FILESYSTEM}:/tmp - ${SHARED_FILESYSTEM}:/tmp
depends_on: depends_on:
dbrepo-table-service: table-service:
condition: service_healthy condition: service_healthy
dbrepo-authentication-service: authentication-service:
condition: service_healthy condition: service_healthy
logging: logging:
driver: json-file driver: json-file
dbrepo-table-service: table-service:
restart: on-failure restart: on-failure
container_name: dbrepo-table-service container_name: dbrepo-table-service
hostname: table-service hostname: table-service
...@@ -169,16 +169,16 @@ services: ...@@ -169,16 +169,16 @@ services:
- /var/run/docker.sock:/var/run/docker.sock - /var/run/docker.sock:/var/run/docker.sock
- ${SHARED_FILESYSTEM}:/tmp - ${SHARED_FILESYSTEM}:/tmp
depends_on: depends_on:
dbrepo-authentication-service: authentication-service:
condition: service_healthy condition: service_healthy
dbrepo-search-service: search-service:
condition: service_started condition: service_started
dbrepo-broker-service: broker-service:
condition: service_started condition: service_started
logging: logging:
driver: json-file driver: json-file
dbrepo-identifier-service: identifier-service:
restart: on-failure restart: on-failure
container_name: dbrepo-identifier-service container_name: dbrepo-identifier-service
hostname: identifier-service hostname: identifier-service
...@@ -188,16 +188,16 @@ services: ...@@ -188,16 +188,16 @@ services:
env_file: env_file:
- .env - .env
depends_on: depends_on:
dbrepo-query-service: query-service:
condition: service_healthy condition: service_healthy
dbrepo-authentication-service: authentication-service:
condition: service_healthy condition: service_healthy
volumes: volumes:
- ${SHARED_FILESYSTEM}:/tmp - ${SHARED_FILESYSTEM}:/tmp
logging: logging:
driver: json-file driver: json-file
dbrepo-metadata-service: fda-metadata-service:
restart: on-failure restart: on-failure
container_name: dbrepo-metadata-service container_name: dbrepo-metadata-service
hostname: metadata-service hostname: metadata-service
...@@ -207,12 +207,12 @@ services: ...@@ -207,12 +207,12 @@ services:
env_file: env_file:
- .env - .env
depends_on: depends_on:
dbrepo-metadata-db: metadata-db:
condition: service_started condition: service_started
logging: logging:
driver: json-file driver: json-file
dbrepo-analyse-service: analyse-service:
restart: on-failure restart: on-failure
container_name: dbrepo-analyse-service container_name: dbrepo-analyse-service
hostname: analyse-service hostname: analyse-service
...@@ -226,12 +226,12 @@ services: ...@@ -226,12 +226,12 @@ services:
- ${SHARED_FILESYSTEM}:/tmp - ${SHARED_FILESYSTEM}:/tmp
- /var/run/docker.sock:/var/run/docker.sock - /var/run/docker.sock:/var/run/docker.sock
depends_on: depends_on:
dbrepo-discovery-service: discovery-service:
condition: service_healthy condition: service_healthy
logging: logging:
driver: json-file driver: json-file
dbrepo-semantics-service: semantics-service:
restart: on-failure restart: on-failure
container_name: dbrepo-semantics-service container_name: dbrepo-semantics-service
hostname: semantics-service hostname: semantics-service
...@@ -244,14 +244,14 @@ services: ...@@ -244,14 +244,14 @@ services:
- ${SHARED_FILESYSTEM}:/tmp - ${SHARED_FILESYSTEM}:/tmp
- /var/run/docker.sock:/var/run/docker.sock - /var/run/docker.sock:/var/run/docker.sock
depends_on: depends_on:
dbrepo-discovery-service: discovery-service:
condition: service_healthy condition: service_healthy
dbrepo-metadata-db: metadata-db:
condition: service_healthy condition: service_healthy
logging: logging:
driver: json-file driver: json-file
dbrepo-broker-service: broker-service:
restart: on-failure restart: on-failure
container_name: dbrepo-broker-service container_name: dbrepo-broker-service
hostname: broker-service hostname: broker-service
...@@ -264,14 +264,14 @@ services: ...@@ -264,14 +264,14 @@ services:
env_file: env_file:
- .env - .env
depends_on: depends_on:
dbrepo-discovery-service: discovery-service:
condition: service_healthy condition: service_healthy
volumes: volumes:
- broker-service-data:/var/lib/rabbitmq/ - broker-service-data:/var/lib/rabbitmq/
logging: logging:
driver: json-file driver: json-file
dbrepo-search-service: search-service:
restart: always restart: always
container_name: dbrepo-search-service container_name: dbrepo-search-service
hostname: search-service hostname: search-service
...@@ -279,7 +279,7 @@ services: ...@@ -279,7 +279,7 @@ services:
networks: networks:
core: core:
depends_on: depends_on:
dbrepo-discovery-service: discovery-service:
condition: service_healthy condition: service_healthy
ports: ports:
- 9200:9200 - 9200:9200
...@@ -290,7 +290,7 @@ services: ...@@ -290,7 +290,7 @@ services:
logging: logging:
driver: json-file driver: json-file
dbrepo-ui: ui:
restart: on-failure restart: on-failure
container_name: dbrepo-ui container_name: dbrepo-ui
hostname: ui hostname: ui
...@@ -303,9 +303,9 @@ services: ...@@ -303,9 +303,9 @@ services:
volumes: volumes:
- ${SHARED_FILESYSTEM}:/tmp - ${SHARED_FILESYSTEM}:/tmp
depends_on: depends_on:
dbrepo-identifier-service: identifier-service:
condition: service_healthy condition: service_healthy
dbrepo-database-service: database-service:
condition: service_healthy condition: service_healthy
logging: logging:
driver: json-file driver: json-file
docker-compose.dbrepo2.yml
+ 38
− 38
View file @ d8f80bf1
...@@ -31,7 +31,7 @@ networks: ...@@ -31,7 +31,7 @@ networks:
services: services:
dbrepo-metadata-db: metadata-db:
restart: on-failure restart: on-failure
container_name: dbrepo-metadata-db container_name: dbrepo-metadata-db
hostname: metadata-db hostname: metadata-db
...@@ -48,7 +48,7 @@ services: ...@@ -48,7 +48,7 @@ services:
logging: logging:
driver: json-file driver: json-file
dbrepo-discovery-service: discovery-service:
restart: on-failure restart: on-failure
container_name: dbrepo-discovery-service container_name: dbrepo-discovery-service
hostname: discovery-service hostname: discovery-service
...@@ -60,7 +60,7 @@ services: ...@@ -60,7 +60,7 @@ services:
logging: logging:
driver: json-file driver: json-file
dbrepo-gateway-service: gateway-service:
restart: on-failure restart: on-failure
container_name: dbrepo-gateway-service container_name: dbrepo-gateway-service
hostname: gateway-service hostname: gateway-service
...@@ -72,12 +72,12 @@ services: ...@@ -72,12 +72,12 @@ services:
env_file: env_file:
- .env - .env
depends_on: depends_on:
dbrepo-discovery-service: discovery-service:
condition: service_healthy condition: service_healthy
logging: logging:
driver: json-file driver: json-file
dbrepo-database-service: database-service:
restart: on-failure restart: on-failure
container_name: dbrepo-database-service container_name: dbrepo-database-service
hostname: database-service hostname: database-service
...@@ -90,16 +90,16 @@ services: ...@@ -90,16 +90,16 @@ services:
volumes: volumes:
- /var/run/docker.sock:/var/run/docker.sock - /var/run/docker.sock:/var/run/docker.sock
depends_on: depends_on:
dbrepo-container-service: container-service:
condition: service_healthy condition: service_healthy
dbrepo-broker-service: broker-service:
condition: service_started condition: service_started
dbrepo-authentication-service: authentication-service:
condition: service_healthy condition: service_healthy
logging: logging:
driver: json-file driver: json-file
dbrepo-container-service: container-service:
restart: on-failure restart: on-failure
container_name: dbrepo-container-service container_name: dbrepo-container-service
hostname: container-service hostname: container-service
...@@ -111,12 +111,12 @@ services: ...@@ -111,12 +111,12 @@ services:
volumes: volumes:
- /var/run/docker.sock:/var/run/docker.sock - /var/run/docker.sock:/var/run/docker.sock
depends_on: depends_on:
dbrepo-authentication-service: authentication-service:
condition: service_healthy condition: service_healthy
logging: logging:
driver: json-file driver: json-file
dbrepo-authentication-service: authentication-service:
restart: on-failure restart: on-failure
container_name: dbrepo-authentication-service container_name: dbrepo-authentication-service
hostname: authentication-service hostname: authentication-service
...@@ -126,16 +126,16 @@ services: ...@@ -126,16 +126,16 @@ services:
env_file: env_file:
- .env - .env
depends_on: depends_on:
dbrepo-discovery-service: discovery-service:
condition: service_healthy condition: service_healthy
dbrepo-broker-service: broker-service:
condition: service_started condition: service_started
dbrepo-metadata-db: metadata-db:
condition: service_healthy condition: service_healthy
logging: logging:
driver: json-file driver: json-file
dbrepo-query-service: query-service:
restart: on-failure restart: on-failure
container_name: dbrepo-query-service container_name: dbrepo-query-service
hostname: query-service hostname: query-service
...@@ -148,14 +148,14 @@ services: ...@@ -148,14 +148,14 @@ services:
volumes: volumes:
- ${SHARED_FILESYSTEM}:/tmp - ${SHARED_FILESYSTEM}:/tmp
depends_on: depends_on:
dbrepo-table-service: table-service:
condition: service_healthy condition: service_healthy
dbrepo-authentication-service: authentication-service:
condition: service_healthy condition: service_healthy
logging: logging:
driver: json-file driver: json-file
dbrepo-table-service: table-service:
restart: on-failure restart: on-failure
container_name: dbrepo-table-service container_name: dbrepo-table-service
hostname: table-service hostname: table-service
...@@ -169,16 +169,16 @@ services: ...@@ -169,16 +169,16 @@ services:
- /var/run/docker.sock:/var/run/docker.sock - /var/run/docker.sock:/var/run/docker.sock
- ${SHARED_FILESYSTEM}:/tmp - ${SHARED_FILESYSTEM}:/tmp
depends_on: depends_on:
dbrepo-authentication-service: authentication-service:
condition: service_healthy condition: service_healthy
dbrepo-search-service: search-service:
condition: service_started condition: service_started
dbrepo-broker-service: broker-service:
condition: service_started condition: service_started
logging: logging:
driver: json-file driver: json-file
dbrepo-identifier-service: identifier-service:
restart: on-failure restart: on-failure
container_name: dbrepo-identifier-service container_name: dbrepo-identifier-service
hostname: identifier-service hostname: identifier-service
...@@ -188,16 +188,16 @@ services: ...@@ -188,16 +188,16 @@ services:
env_file: env_file:
- .env - .env
depends_on: depends_on:
dbrepo-query-service: query-service:
condition: service_healthy condition: service_healthy
dbrepo-authentication-service: authentication-service:
condition: service_healthy condition: service_healthy
volumes: volumes:
- ${SHARED_FILESYSTEM}:/tmp - ${SHARED_FILESYSTEM}:/tmp
logging: logging:
driver: json-file driver: json-file
dbrepo-metadata-service: metadata-service:
restart: on-failure restart: on-failure
container_name: dbrepo-metadata-service container_name: dbrepo-metadata-service
hostname: metadata-service hostname: metadata-service
...@@ -207,12 +207,12 @@ services: ...@@ -207,12 +207,12 @@ services:
env_file: env_file:
- .env - .env
depends_on: depends_on:
dbrepo-metadata-db: metadata-db:
condition: service_started condition: service_started
logging: logging:
driver: json-file driver: json-file
dbrepo-analyse-service: analyse-service:
restart: on-failure restart: on-failure
container_name: dbrepo-analyse-service container_name: dbrepo-analyse-service
hostname: analyse-service hostname: analyse-service
...@@ -226,12 +226,12 @@ services: ...@@ -226,12 +226,12 @@ services:
- ${SHARED_FILESYSTEM}:/tmp - ${SHARED_FILESYSTEM}:/tmp
- /var/run/docker.sock:/var/run/docker.sock - /var/run/docker.sock:/var/run/docker.sock
depends_on: depends_on:
dbrepo-discovery-service: discovery-service:
condition: service_healthy condition: service_healthy
logging: logging:
driver: json-file driver: json-file
dbrepo-semantics-service: semantics-service:
restart: on-failure restart: on-failure
container_name: dbrepo-semantics-service container_name: dbrepo-semantics-service
hostname: semantics-service hostname: semantics-service
...@@ -244,14 +244,14 @@ services: ...@@ -244,14 +244,14 @@ services:
- ${SHARED_FILESYSTEM}:/tmp - ${SHARED_FILESYSTEM}:/tmp
- /var/run/docker.sock:/var/run/docker.sock - /var/run/docker.sock:/var/run/docker.sock
depends_on: depends_on:
dbrepo-discovery-service: discovery-service:
condition: service_healthy condition: service_healthy
dbrepo-metadata-db: metadata-db:
condition: service_healthy condition: service_healthy
logging: logging:
driver: json-file driver: json-file
dbrepo-broker-service: broker-service:
restart: on-failure restart: on-failure
container_name: dbrepo-broker-service container_name: dbrepo-broker-service
hostname: broker-service hostname: broker-service
...@@ -264,14 +264,14 @@ services: ...@@ -264,14 +264,14 @@ services:
env_file: env_file:
- .env - .env
depends_on: depends_on:
dbrepo-discovery-service: discovery-service:
condition: service_healthy condition: service_healthy
volumes: volumes:
- broker-service-data:/var/lib/rabbitmq/ - broker-service-data:/var/lib/rabbitmq/
logging: logging:
driver: json-file driver: json-file
dbrepo-search-service: search-service:
restart: always restart: always
container_name: dbrepo-search-service container_name: dbrepo-search-service
hostname: search-service hostname: search-service
...@@ -279,7 +279,7 @@ services: ...@@ -279,7 +279,7 @@ services:
networks: networks:
core: core:
depends_on: depends_on:
dbrepo-discovery-service: discovery-service:
condition: service_healthy condition: service_healthy
env_file: env_file:
- .env - .env
...@@ -288,7 +288,7 @@ services: ...@@ -288,7 +288,7 @@ services:
logging: logging:
driver: json-file driver: json-file
dbrepo-ui: ui:
restart: on-failure restart: on-failure
container_name: dbrepo-ui container_name: dbrepo-ui
hostname: ui hostname: ui
...@@ -301,9 +301,9 @@ services: ...@@ -301,9 +301,9 @@ services:
volumes: volumes:
- ${SHARED_FILESYSTEM}:/tmp - ${SHARED_FILESYSTEM}:/tmp
depends_on: depends_on:
dbrepo-identifier-service: identifier-service:
condition: service_healthy condition: service_healthy
dbrepo-database-service: database-service:
condition: service_healthy condition: service_healthy
logging: logging:
driver: json-file driver: json-file
docker-compose.prod.yml
+ 38
− 38
View file @ d8f80bf1
...@@ -31,7 +31,7 @@ networks: ...@@ -31,7 +31,7 @@ networks:
services: services:
dbrepo-metadata-db: metadata-db:
restart: on-failure restart: on-failure
container_name: dbrepo-metadata-db container_name: dbrepo-metadata-db
hostname: metadata-db hostname: metadata-db
...@@ -48,7 +48,7 @@ services: ...@@ -48,7 +48,7 @@ services:
logging: logging:
driver: json-file driver: json-file
dbrepo-discovery-service: discovery-service:
restart: on-failure restart: on-failure
container_name: dbrepo-discovery-service container_name: dbrepo-discovery-service
hostname: discovery-service hostname: discovery-service
...@@ -60,7 +60,7 @@ services: ...@@ -60,7 +60,7 @@ services:
logging: logging:
driver: json-file driver: json-file
dbrepo-gateway-service: gateway-service:
restart: on-failure restart: on-failure
container_name: dbrepo-gateway-service container_name: dbrepo-gateway-service
hostname: gateway-service hostname: gateway-service
...@@ -72,12 +72,12 @@ services: ...@@ -72,12 +72,12 @@ services:
env_file: env_file:
- .env - .env
depends_on: depends_on:
dbrepo-discovery-service: discovery-service:
condition: service_healthy condition: service_healthy
logging: logging:
driver: json-file driver: json-file
dbrepo-database-service: database-service:
restart: on-failure restart: on-failure
container_name: dbrepo-database-service container_name: dbrepo-database-service
hostname: database-service hostname: database-service
...@@ -90,16 +90,16 @@ services: ...@@ -90,16 +90,16 @@ services:
volumes: volumes:
- /var/run/docker.sock:/var/run/docker.sock - /var/run/docker.sock:/var/run/docker.sock
depends_on: depends_on:
dbrepo-container-service: container-service:
condition: service_healthy condition: service_healthy
dbrepo-broker-service: broker-service:
condition: service_started condition: service_started
dbrepo-authentication-service: authentication-service:
condition: service_healthy condition: service_healthy
logging: logging:
driver: json-file driver: json-file
dbrepo-container-service: container-service:
restart: on-failure restart: on-failure
container_name: dbrepo-container-service container_name: dbrepo-container-service
hostname: container-service hostname: container-service
...@@ -111,12 +111,12 @@ services: ...@@ -111,12 +111,12 @@ services:
volumes: volumes:
- /var/run/docker.sock:/var/run/docker.sock - /var/run/docker.sock:/var/run/docker.sock
depends_on: depends_on:
dbrepo-authentication-service: authentication-service:
condition: service_healthy condition: service_healthy
logging: logging:
driver: json-file driver: json-file
dbrepo-authentication-service: authentication-service:
restart: on-failure restart: on-failure
container_name: dbrepo-authentication-service container_name: dbrepo-authentication-service
hostname: authentication-service hostname: authentication-service
...@@ -126,16 +126,16 @@ services: ...@@ -126,16 +126,16 @@ services:
env_file: env_file:
- .env - .env
depends_on: depends_on:
dbrepo-discovery-service: discovery-service:
condition: service_healthy condition: service_healthy
dbrepo-broker-service: broker-service:
condition: service_started condition: service_started
dbrepo-metadata-db: metadata-db:
condition: service_healthy condition: service_healthy
logging: logging:
driver: json-file driver: json-file
dbrepo-query-service: query-service:
restart: on-failure restart: on-failure
container_name: dbrepo-query-service container_name: dbrepo-query-service
hostname: query-service hostname: query-service
...@@ -148,14 +148,14 @@ services: ...@@ -148,14 +148,14 @@ services:
volumes: volumes:
- ${SHARED_FILESYSTEM}:/tmp - ${SHARED_FILESYSTEM}:/tmp
depends_on: depends_on:
dbrepo-table-service: table-service:
condition: service_healthy condition: service_healthy
dbrepo-authentication-service: authentication-service:
condition: service_healthy condition: service_healthy
logging: logging:
driver: json-file driver: json-file
dbrepo-table-service: table-service:
restart: on-failure restart: on-failure
container_name: dbrepo-table-service container_name: dbrepo-table-service
hostname: table-service hostname: table-service
...@@ -169,16 +169,16 @@ services: ...@@ -169,16 +169,16 @@ services:
- /var/run/docker.sock:/var/run/docker.sock - /var/run/docker.sock:/var/run/docker.sock
- ${SHARED_FILESYSTEM}:/tmp - ${SHARED_FILESYSTEM}:/tmp
depends_on: depends_on:
dbrepo-authentication-service: authentication-service:
condition: service_healthy condition: service_healthy
dbrepo-search-service: search-service:
condition: service_started condition: service_started
dbrepo-broker-service: broker-service:
condition: service_started condition: service_started
logging: logging:
driver: json-file driver: json-file
dbrepo-identifier-service: identifier-service:
restart: on-failure restart: on-failure
container_name: dbrepo-identifier-service container_name: dbrepo-identifier-service
hostname: identifier-service hostname: identifier-service
...@@ -188,16 +188,16 @@ services: ...@@ -188,16 +188,16 @@ services:
env_file: env_file:
- .env - .env
depends_on: depends_on:
dbrepo-query-service: query-service:
condition: service_healthy condition: service_healthy
dbrepo-authentication-service: authentication-service:
condition: service_healthy condition: service_healthy
volumes: volumes:
- ${SHARED_FILESYSTEM}:/tmp - ${SHARED_FILESYSTEM}:/tmp
logging: logging:
driver: json-file driver: json-file
dbrepo-metadata-service: metadata-service:
restart: on-failure restart: on-failure
container_name: dbrepo-metadata-service container_name: dbrepo-metadata-service
hostname: metadata-service hostname: metadata-service
...@@ -207,12 +207,12 @@ services: ...@@ -207,12 +207,12 @@ services:
env_file: env_file:
- .env - .env
depends_on: depends_on:
dbrepo-metadata-db: metadata-db:
condition: service_started condition: service_started
logging: logging:
driver: json-file driver: json-file
dbrepo-analyse-service: analyse-service:
restart: on-failure restart: on-failure
container_name: dbrepo-analyse-service container_name: dbrepo-analyse-service
hostname: analyse-service hostname: analyse-service
...@@ -226,12 +226,12 @@ services: ...@@ -226,12 +226,12 @@ services:
- ${SHARED_FILESYSTEM}:/tmp - ${SHARED_FILESYSTEM}:/tmp
- /var/run/docker.sock:/var/run/docker.sock - /var/run/docker.sock:/var/run/docker.sock
depends_on: depends_on:
dbrepo-discovery-service: discovery-service:
condition: service_healthy condition: service_healthy
logging: logging:
driver: json-file driver: json-file
dbrepo-semantics-service: semantics-service:
restart: on-failure restart: on-failure
container_name: dbrepo-semantics-service container_name: dbrepo-semantics-service
hostname: semantics-service hostname: semantics-service
...@@ -244,14 +244,14 @@ services: ...@@ -244,14 +244,14 @@ services:
- ${SHARED_FILESYSTEM}:/tmp - ${SHARED_FILESYSTEM}:/tmp
- /var/run/docker.sock:/var/run/docker.sock - /var/run/docker.sock:/var/run/docker.sock
depends_on: depends_on:
dbrepo-discovery-service: discovery-service:
condition: service_healthy condition: service_healthy
dbrepo-metadata-db: metadata-db:
condition: service_healthy condition: service_healthy
logging: logging:
driver: json-file driver: json-file
dbrepo-broker-service: broker-service:
restart: on-failure restart: on-failure
container_name: dbrepo-broker-service container_name: dbrepo-broker-service
hostname: broker-service hostname: broker-service
...@@ -263,14 +263,14 @@ services: ...@@ -263,14 +263,14 @@ services:
env_file: env_file:
- .env - .env
depends_on: depends_on:
dbrepo-discovery-service: discovery-service:
condition: service_healthy condition: service_healthy
volumes: volumes:
- broker-service-data:/var/lib/rabbitmq/ - broker-service-data:/var/lib/rabbitmq/
logging: logging:
driver: json-file driver: json-file
dbrepo-search-service: search-service:
restart: always restart: always
container_name: dbrepo-search-service container_name: dbrepo-search-service
hostname: search-service hostname: search-service
...@@ -278,7 +278,7 @@ services: ...@@ -278,7 +278,7 @@ services:
networks: networks:
core: core:
depends_on: depends_on:
dbrepo-discovery-service: discovery-service:
condition: service_healthy condition: service_healthy
env_file: env_file:
- .env - .env
...@@ -287,7 +287,7 @@ services: ...@@ -287,7 +287,7 @@ services:
logging: logging:
driver: json-file driver: json-file
dbrepo-ui: ui:
restart: on-failure restart: on-failure
container_name: dbrepo-ui container_name: dbrepo-ui
hostname: ui hostname: ui
...@@ -302,9 +302,9 @@ services: ...@@ -302,9 +302,9 @@ services:
volumes: volumes:
- ${SHARED_FILESYSTEM}:/tmp - ${SHARED_FILESYSTEM}:/tmp
depends_on: depends_on:
dbrepo-identifier-service: identifier-service:
condition: service_healthy condition: service_healthy
dbrepo-database-service: database-service:
condition: service_healthy condition: service_healthy
logging: logging:
driver: json-file driver: json-file
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment