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

Use host network

parent 41d05bdc
No related branches found
No related tags found
3 merge requests!231CI: Remove build for log-service,!228Better error message handling in the frontend,!223Release of version 1.4.0
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
TAG ?= latest TAG ?= latest
TRIVY_VERSION ?= v0.41.0 TRIVY_VERSION ?= v0.41.0
REPOSITORY_URL ?= docker.io/dbrepo REPOSITORY_1_URL ?= docker.io/dbrepo
REPOSITORY2_URL ?= s210.dl.hpc.tuwien.ac.at/dbrepo REPOSITORY_2_URL ?= s210.dl.hpc.tuwien.ac.at/dbrepo
all: build all: build
...@@ -28,9 +28,9 @@ build-analyse-service: ...@@ -28,9 +28,9 @@ build-analyse-service:
bash ./dbrepo-analyse-service/build.sh bash ./dbrepo-analyse-service/build.sh
build-docker: build-docker:
docker build -t dbrepo-metadata-service:build --target build dbrepo-metadata-service docker build --network=host -t dbrepo-metadata-service:build --target build dbrepo-metadata-service
docker build -t dbrepo-data-service:build --target build dbrepo-data-service docker build --network=host -t dbrepo-data-service:build --target build dbrepo-data-service
docker build ./dbrepo-log-service -t dbrepo-log-service docker build --network=host ./dbrepo-log-service -t dbrepo-log-service
docker compose build --parallel docker compose build --parallel
build-frontend: build-frontend:
...@@ -43,102 +43,102 @@ build-clients: ...@@ -43,102 +43,102 @@ build-clients:
tag: tag-analyse-service tag-authentication-service tag-metadata-db tag-ui tag-metadata-service tag-data-service tag-log-service tag-search-db tag-search-db-init tag-search-service tag-data-db-sidecar tag: tag-analyse-service tag-authentication-service tag-metadata-db tag-ui tag-metadata-service tag-data-service tag-log-service tag-search-db tag-search-db-init tag-search-service tag-data-db-sidecar
tag-analyse-service: tag-analyse-service:
docker tag dbrepo-analyse-service:latest "${REPOSITORY_URL}/analyse-service:${TAG}" docker tag dbrepo-analyse-service:latest "${REPOSITORY_1_URL}/analyse-service:${TAG}"
docker tag dbrepo-analyse-service:latest "${REPOSITORY2_URL}/analyse-service:${TAG}" docker tag dbrepo-analyse-service:latest "${REPOSITORY_2_URL}/analyse-service:${TAG}"
tag-authentication-service: tag-authentication-service:
docker tag dbrepo-authentication-service:latest "${REPOSITORY_URL}/authentication-service:${TAG}" docker tag dbrepo-authentication-service:latest "${REPOSITORY_1_URL}/authentication-service:${TAG}"
docker tag dbrepo-authentication-service:latest "${REPOSITORY2_URL}/authentication-service:${TAG}" docker tag dbrepo-authentication-service:latest "${REPOSITORY_2_URL}/authentication-service:${TAG}"
tag-metadata-db: tag-metadata-db:
docker tag dbrepo-metadata-db:latest "${REPOSITORY_URL}/metadata-db:${TAG}" docker tag dbrepo-metadata-db:latest "${REPOSITORY_1_URL}/metadata-db:${TAG}"
docker tag dbrepo-metadata-db:latest "${REPOSITORY2_URL}/metadata-db:${TAG}" docker tag dbrepo-metadata-db:latest "${REPOSITORY_2_URL}/metadata-db:${TAG}"
tag-ui: tag-ui:
docker tag dbrepo-ui:latest "${REPOSITORY_URL}/ui:${TAG}" docker tag dbrepo-ui:latest "${REPOSITORY_1_URL}/ui:${TAG}"
docker tag dbrepo-ui:latest "${REPOSITORY2_URL}/ui:${TAG}" docker tag dbrepo-ui:latest "${REPOSITORY_2_URL}/ui:${TAG}"
tag-data-service: tag-data-service:
docker tag dbrepo-data-service:latest "${REPOSITORY_URL}/data-service:${TAG}" docker tag dbrepo-data-service:latest "${REPOSITORY_1_URL}/data-service:${TAG}"
docker tag dbrepo-data-service:latest "${REPOSITORY2_URL}/data-service:${TAG} docker tag dbrepo-data-service:latest "${REPOSITORY_2_URL}/data-service:${TAG}"
tag-metadata-service: tag-metadata-service:
docker tag dbrepo-metadata-service:latest "${REPOSITORY_URL}/metadata-service:${TAG}" docker tag dbrepo-metadata-service:latest "${REPOSITORY_1_URL}/metadata-service:${TAG}"
docker tag dbrepo-metadata-service:latest "${REPOSITORY2_URL}/metadata-service:${TAG}" docker tag dbrepo-metadata-service:latest "${REPOSITORY_2_URL}/metadata-service:${TAG}"
tag-search-db: tag-search-db:
docker tag dbrepo-search-db:latest "${REPOSITORY_URL}/search-db:${TAG}" docker tag dbrepo-search-db:latest "${REPOSITORY_1_URL}/search-db:${TAG}"
docker tag dbrepo-search-db:latest "${REPOSITORY2_URL}/search-db:${TAG}" docker tag dbrepo-search-db:latest "${REPOSITORY_2_URL}/search-db:${TAG}"
tag-data-db-sidecar: tag-data-db-sidecar:
docker tag dbrepo-data-db-sidecar:latest "${REPOSITORY_URL}/data-db-sidecar:${TAG}" docker tag dbrepo-data-db-sidecar:latest "${REPOSITORY_1_URL}/data-db-sidecar:${TAG}"
docker tag dbrepo-data-db-sidecar:latest "${REPOSITORY2_URL}/data-db-sidecar:${TAG}" docker tag dbrepo-data-db-sidecar:latest "${REPOSITORY_2_URL}/data-db-sidecar:${TAG}"
tag-search-db-init: tag-search-db-init:
docker tag dbrepo-search-db-init:latest "${REPOSITORY_URL}/search-db-init:${TAG}" docker tag dbrepo-search-db-init:latest "${REPOSITORY_1_URL}/search-db-init:${TAG}"
docker tag dbrepo-search-db-init:latest "${REPOSITORY2_URL}/search-db-init:${TAG}" docker tag dbrepo-search-db-init:latest "${REPOSITORY_2_URL}/search-db-init:${TAG}"
tag-log-service: tag-log-service:
docker tag dbrepo-log-service:latest "${REPOSITORY_URL}/log-service:${TAG}" docker tag dbrepo-log-service:latest "${REPOSITORY_1_URL}/log-service:${TAG}"
docker tag dbrepo-log-service:latest "${REPOSITORY2_URL}/log-service:${TAG}" docker tag dbrepo-log-service:latest "${REPOSITORY_2_URL}/log-service:${TAG}"
tag-search-service: tag-search-service:
docker tag dbrepo-search-service:latest "${REPOSITORY_URL}/search-service:${TAG}" docker tag dbrepo-search-service:latest "${REPOSITORY_1_URL}/search-service:${TAG}"
docker tag dbrepo-search-service:latest "${REPOSITORY2_URL}/search-service:${TAG}" docker tag dbrepo-search-service:latest "${REPOSITORY_2_URL}/search-service:${TAG}"
tag-storage-service-init: tag-storage-service-init:
docker tag dbrepo-storage-service-init:latest "${REPOSITORY_URL}/storage-service-init:${TAG}" docker tag dbrepo-storage-service-init:latest "${REPOSITORY_1_URL}/storage-service-init:${TAG}"
docker tag dbrepo-storage-service-init:latest "${REPOSITORY2_URL}/storage-service-init:${TAG}" docker tag dbrepo-storage-service-init:latest "${REPOSITORY_2_URL}/storage-service-init:${TAG}"
release: build-docker tag release-analyse-service release-authentication-service release-metadata-db release-ui release-metadata-service release-data-service release-log-service release-search-db release-search-db-init release-search-service release-data-db-sidecar release: build-docker tag release-analyse-service release-authentication-service release-metadata-db release-ui release-metadata-service release-data-service release-log-service release-search-db release-search-db-init release-search-service release-data-db-sidecar
release-analyse-service: tag-analyse-service release-analyse-service: tag-analyse-service
docker push "${REPOSITORY_URL}/analyse-service:${TAG}" docker push "${REPOSITORY_1_URL}/analyse-service:${TAG}"
docker push "${REPOSITORY2_URL}/analyse-service:${TAG}" docker push "${REPOSITORY_2_URL}/analyse-service:${TAG}"
release-authentication-service: tag-authentication-service release-authentication-service: tag-authentication-service
docker push "${REPOSITORY_URL}/authentication-service:${TAG}" docker push "${REPOSITORY_1_URL}/authentication-service:${TAG}"
docker push "${REPOSITORY2_URL}/authentication-service:${TAG}" docker push "${REPOSITORY_2_URL}/authentication-service:${TAG}"
release-metadata-db: tag-metadata-db release-metadata-db: tag-metadata-db
docker push "${REPOSITORY_URL}/metadata-db:${TAG}" docker push "${REPOSITORY_1_URL}/metadata-db:${TAG}"
docker push "${REPOSITORY2_URL}/metadata-db:${TAG}" docker push "${REPOSITORY_2_URL}/metadata-db:${TAG}"
release-ui: tag-ui release-ui: tag-ui
docker push "${REPOSITORY_URL}/ui:${TAG}" docker push "${REPOSITORY_1_URL}/ui:${TAG}"
docker push "${REPOSITORY2_URL}/ui:${TAG}" docker push "${REPOSITORY_2_URL}/ui:${TAG}"
release-data-service: tag-data-service release-data-service: tag-data-service
docker push "${REPOSITORY_URL}/data-service:${TAG}" docker push "${REPOSITORY_1_URL}/data-service:${TAG}"
docker push "${REPOSITORY2_URL}/data-service:${TAG}" docker push "${REPOSITORY_2_URL}/data-service:${TAG}"
release-search-db: tag-search-db release-search-db: tag-search-db
docker push "${REPOSITORY_URL}/search-db:${TAG}" docker push "${REPOSITORY_1_URL}/search-db:${TAG}"
docker push "${REPOSITORY2_URL}/search-db:${TAG}" docker push "${REPOSITORY_2_URL}/search-db:${TAG}"
release-search-db-init: tag-search-db-init release-search-db-init: tag-search-db-init
docker push "${REPOSITORY_URL}/search-db-init:${TAG}" docker push "${REPOSITORY_1_URL}/search-db-init:${TAG}"
docker push "${REPOSITORY2_URL}/search-db-init:${TAG}" docker push "${REPOSITORY_2_URL}/search-db-init:${TAG}"
release-data-db-sidecar: tag-data-db-sidecar release-data-db-sidecar: tag-data-db-sidecar
docker push "${REPOSITORY_URL}/data-db-sidecar:${TAG}" docker push "${REPOSITORY_1_URL}/data-db-sidecar:${TAG}"
docker push "${REPOSITORY2_URL}/data-db-sidecar:${TAG}" docker push "${REPOSITORY_2_URL}/data-db-sidecar:${TAG}"
release-metadata-service: tag-metadata-service release-metadata-service: tag-metadata-service
docker push "${REPOSITORY_URL}/metadata-service:${TAG}" docker push "${REPOSITORY_1_URL}/metadata-service:${TAG}"
docker push "${REPOSITORY2_URL}/metadata-service:${TAG}" docker push "${REPOSITORY_2_URL}/metadata-service:${TAG}"
release-log-service: tag-log-service release-log-service: tag-log-service
docker push "${REPOSITORY_URL}/log-service:${TAG}" docker push "${REPOSITORY_1_URL}/log-service:${TAG}"
docker push "${REPOSITORY2_URL}/log-service:${TAG}" docker push "${REPOSITORY_2_URL}/log-service:${TAG}"
release-search-service: tag-search-service release-search-service: tag-search-service
docker push "${REPOSITORY_URL}/search-service:${TAG}" docker push "${REPOSITORY_1_URL}/search-service:${TAG}"
docker push "${REPOSITORY2_URL}/search-service:${TAG}" docker push "${REPOSITORY_2_URL}/search-service:${TAG}"
release-storage-service-init: tag-storage-service-init release-storage-service-init: tag-storage-service-init
docker push "${REPOSITORY_URL}/storage-service-init:${TAG}" docker push "${REPOSITORY_1_URL}/storage-service-init:${TAG}"
docker push "${REPOSITORY2_URL}/storage-service-init:${TAG}" docker push "${REPOSITORY_2_URL}/storage-service-init:${TAG}"
test-backend: test-metadata-service test-analyse-service test-data-service test-backend: test-metadata-service test-analyse-service test-data-service
......
...@@ -19,7 +19,9 @@ services: ...@@ -19,7 +19,9 @@ services:
container_name: dbrepo-metadata-db container_name: dbrepo-metadata-db
hostname: metadata-db hostname: metadata-db
image: dbrepo-metadata-db:latest image: dbrepo-metadata-db:latest
build: ./dbrepo-metadata-db build:
context: ./dbrepo-metadata-db
network: host
volumes: volumes:
- metadata-db-data:/bitnami/mariadb - metadata-db-data:/bitnami/mariadb
- ./dbrepo-metadata-db/setup-schema_local.sql:/docker-entrypoint-initdb.d/setup-schema_local.sql - ./dbrepo-metadata-db/setup-schema_local.sql:/docker-entrypoint-initdb.d/setup-schema_local.sql
...@@ -82,7 +84,9 @@ services: ...@@ -82,7 +84,9 @@ services:
container_name: dbrepo-authentication-service container_name: dbrepo-authentication-service
hostname: authentication-service hostname: authentication-service
image: dbrepo-authentication-service:latest image: dbrepo-authentication-service:latest
build: ./dbrepo-authentication-service build:
context: ./dbrepo-authentication-service
network: host
ports: ports:
- "8443:8443" - "8443:8443"
- "8080:8080" - "8080:8080"
...@@ -108,7 +112,9 @@ services: ...@@ -108,7 +112,9 @@ services:
container_name: dbrepo-metadata-service container_name: dbrepo-metadata-service
hostname: metadata-service hostname: metadata-service
image: dbrepo-metadata-service:latest image: dbrepo-metadata-service:latest
build: ./dbrepo-metadata-service build:
context: ./dbrepo-metadata-service
network: host
volumes: volumes:
- "${SHARED_FILESYSTEM:-/tmp}:/tmp" - "${SHARED_FILESYSTEM:-/tmp}:/tmp"
ports: ports:
...@@ -182,7 +188,9 @@ services: ...@@ -182,7 +188,9 @@ services:
container_name: dbrepo-analyse-service container_name: dbrepo-analyse-service
hostname: analyse-service hostname: analyse-service
image: dbrepo-analyse-service:latest image: dbrepo-analyse-service:latest
build: ./dbrepo-analyse-service build:
context: ./dbrepo-analyse-service
network: host
ports: ports:
- "5000:5000" - "5000:5000"
environment: environment:
...@@ -227,7 +235,9 @@ services: ...@@ -227,7 +235,9 @@ services:
container_name: dbrepo-search-db container_name: dbrepo-search-db
hostname: search-db hostname: search-db
image: dbrepo-search-db:latest image: dbrepo-search-db:latest
build: ./dbrepo-search-db build:
context: ./dbrepo-search-db
network: host
ports: ports:
- "9200:9200" - "9200:9200"
healthcheck: healthcheck:
...@@ -252,7 +262,9 @@ services: ...@@ -252,7 +262,9 @@ services:
container_name: dbrepo-search-service container_name: dbrepo-search-service
hostname: search-service hostname: search-service
image: dbrepo-search-service:latest image: dbrepo-search-service:latest
build: ./dbrepo-search-service build:
context: ./dbrepo-search-service
network: host
ports: ports:
- "4000:4000" - "4000:4000"
environment: environment:
...@@ -265,7 +277,9 @@ services: ...@@ -265,7 +277,9 @@ services:
container_name: dbrepo-data-db-sidecar container_name: dbrepo-data-db-sidecar
hostname: data-db-sidecar hostname: data-db-sidecar
image: dbrepo-data-db-sidecar:latest image: dbrepo-data-db-sidecar:latest
build: ./dbrepo-data-db/sidecar build:
context: ./dbrepo-data-db/sidecar
network: host
ports: ports:
- "3305:3305" - "3305:3305"
environment: environment:
...@@ -286,7 +300,9 @@ services: ...@@ -286,7 +300,9 @@ services:
container_name: dbrepo-ui container_name: dbrepo-ui
hostname: ui hostname: ui
image: dbrepo-ui:latest image: dbrepo-ui:latest
build: ./dbrepo-ui build:
context: ./dbrepo-ui
network: host
volumes: volumes:
- ./dbrepo-ui/dbrepo.config.json:/app/dbrepo.config.json - ./dbrepo-ui/dbrepo.config.json:/app/dbrepo.config.json
depends_on: depends_on:
...@@ -343,7 +359,9 @@ services: ...@@ -343,7 +359,9 @@ services:
container_name: dbrepo-search-db-init container_name: dbrepo-search-db-init
hostname: search-db-init hostname: search-db-init
image: dbrepo-search-db-init:latest image: dbrepo-search-db-init:latest
build: ./dbrepo-search-db/init build:
context: ./dbrepo-search-db/init
network: host
environment: environment:
OPENSEARCH_HOST: ${SEARCH_DB_HOST:-http://search-db:9200} OPENSEARCH_HOST: ${SEARCH_DB_HOST:-http://search-db:9200}
CURL_EXTRA_ARGS: ${SEARCH_DB_EXTRA_ARGS:-} CURL_EXTRA_ARGS: ${SEARCH_DB_EXTRA_ARGS:-}
...@@ -377,7 +395,9 @@ services: ...@@ -377,7 +395,9 @@ services:
container_name: dbrepo-storage-service-init container_name: dbrepo-storage-service-init
hostname: storage-service-init hostname: storage-service-init
image: dbrepo-storage-service-init:latest image: dbrepo-storage-service-init:latest
build: ./dbrepo-storage-service/init build:
context: ./dbrepo-storage-service/init
network: host
environment: environment:
SEAWEEDFS_ENDPOINT: "${STORAGE_SEAWEEDFS_ENDPOINT:-storage-service:9333}" SEAWEEDFS_ENDPOINT: "${STORAGE_SEAWEEDFS_ENDPOINT:-storage-service:9333}"
depends_on: depends_on:
...@@ -417,7 +437,9 @@ services: ...@@ -417,7 +437,9 @@ services:
container_name: dbrepo-data-service container_name: dbrepo-data-service
hostname: data-service hostname: data-service
image: dbrepo-data-service:latest image: dbrepo-data-service:latest
build: ./dbrepo-data-service build:
context: ./dbrepo-data-service
network: host
ports: ports:
- "9093:9093" - "9093:9093"
environment: environment:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment