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

Updated the compose files

parent f3847755
No related branches found
No related tags found
2 merge requests!163Relase 1.3.0,!159Large update
This commit is part of merge request !159. Comments created here will be created in the context of that merge request.
Show whitespace changes
Inline Side-by-side
.gitlab-ci.yml
+ 64
− 0
View file @ c22c1f1d
...@@ -292,6 +292,10 @@ scan-analyse-service: ...@@ -292,6 +292,10 @@ scan-analyse-service:
stage: scan-docker stage: scan-docker
needs: needs:
- build-docker - build-docker
only:
refs:
- dev
- master
allow_failure: true allow_failure: true
before_script: before_script:
- docker logout ghcr.io - docker logout ghcr.io
...@@ -310,6 +314,10 @@ scan-authentication-service: ...@@ -310,6 +314,10 @@ scan-authentication-service:
stage: scan-docker stage: scan-docker
needs: needs:
- build-docker - build-docker
only:
refs:
- dev
- master
allow_failure: true allow_failure: true
before_script: before_script:
- docker logout ghcr.io - docker logout ghcr.io
...@@ -328,6 +336,10 @@ scan-broker-service: ...@@ -328,6 +336,10 @@ scan-broker-service:
stage: scan-docker stage: scan-docker
needs: needs:
- build-docker - build-docker
only:
refs:
- dev
- master
allow_failure: true allow_failure: true
before_script: before_script:
- docker logout ghcr.io - docker logout ghcr.io
...@@ -346,6 +358,10 @@ scan-container-service: ...@@ -346,6 +358,10 @@ scan-container-service:
stage: scan-docker stage: scan-docker
needs: needs:
- build-docker - build-docker
only:
refs:
- dev
- master
allow_failure: true allow_failure: true
before_script: before_script:
- docker logout ghcr.io - docker logout ghcr.io
...@@ -364,6 +380,10 @@ scan-database-service: ...@@ -364,6 +380,10 @@ scan-database-service:
stage: scan-docker stage: scan-docker
needs: needs:
- build-docker - build-docker
only:
refs:
- dev
- master
allow_failure: true allow_failure: true
before_script: before_script:
- docker logout ghcr.io - docker logout ghcr.io
...@@ -382,6 +402,10 @@ scan-gateway-service: ...@@ -382,6 +402,10 @@ scan-gateway-service:
stage: scan-docker stage: scan-docker
needs: needs:
- build-docker - build-docker
only:
refs:
- dev
- master
allow_failure: true allow_failure: true
before_script: before_script:
- docker logout ghcr.io - docker logout ghcr.io
...@@ -400,6 +424,10 @@ scan-identifier-service: ...@@ -400,6 +424,10 @@ scan-identifier-service:
stage: scan-docker stage: scan-docker
needs: needs:
- build-docker - build-docker
only:
refs:
- dev
- master
allow_failure: true allow_failure: true
before_script: before_script:
- docker logout ghcr.io - docker logout ghcr.io
...@@ -418,6 +446,10 @@ scan-metadata-db: ...@@ -418,6 +446,10 @@ scan-metadata-db:
stage: scan-docker stage: scan-docker
needs: needs:
- build-docker - build-docker
only:
refs:
- dev
- master
allow_failure: true allow_failure: true
before_script: before_script:
- docker logout ghcr.io - docker logout ghcr.io
...@@ -436,6 +468,10 @@ scan-metadata-service: ...@@ -436,6 +468,10 @@ scan-metadata-service:
stage: scan-docker stage: scan-docker
needs: needs:
- build-docker - build-docker
only:
refs:
- dev
- master
allow_failure: true allow_failure: true
before_script: before_script:
- docker logout ghcr.io - docker logout ghcr.io
...@@ -454,6 +490,10 @@ scan-proxy: ...@@ -454,6 +490,10 @@ scan-proxy:
stage: scan-docker stage: scan-docker
needs: needs:
- build-docker - build-docker
only:
refs:
- dev
- master
allow_failure: true allow_failure: true
before_script: before_script:
- docker logout ghcr.io - docker logout ghcr.io
...@@ -472,6 +512,10 @@ scan-query-service: ...@@ -472,6 +512,10 @@ scan-query-service:
stage: scan-docker stage: scan-docker
needs: needs:
- build-docker - build-docker
only:
refs:
- dev
- master
allow_failure: true allow_failure: true
before_script: before_script:
- docker logout ghcr.io - docker logout ghcr.io
...@@ -490,6 +534,10 @@ scan-search-service: ...@@ -490,6 +534,10 @@ scan-search-service:
stage: scan-docker stage: scan-docker
needs: needs:
- build-docker - build-docker
only:
refs:
- dev
- master
allow_failure: true allow_failure: true
before_script: before_script:
- docker logout ghcr.io - docker logout ghcr.io
...@@ -508,6 +556,10 @@ scan-semantics-service: ...@@ -508,6 +556,10 @@ scan-semantics-service:
stage: scan-docker stage: scan-docker
needs: needs:
- build-docker - build-docker
only:
refs:
- dev
- master
allow_failure: true allow_failure: true
before_script: before_script:
- docker logout ghcr.io - docker logout ghcr.io
...@@ -526,6 +578,10 @@ scan-table-service: ...@@ -526,6 +578,10 @@ scan-table-service:
stage: scan-docker stage: scan-docker
needs: needs:
- build-docker - build-docker
only:
refs:
- dev
- master
allow_failure: true allow_failure: true
before_script: before_script:
- docker logout ghcr.io - docker logout ghcr.io
...@@ -544,6 +600,10 @@ scan-ui: ...@@ -544,6 +600,10 @@ scan-ui:
stage: scan-docker stage: scan-docker
needs: needs:
- build-docker - build-docker
only:
refs:
- dev
- master
allow_failure: true allow_failure: true
before_script: before_script:
- docker logout ghcr.io - docker logout ghcr.io
...@@ -562,6 +622,10 @@ scan-user-service: ...@@ -562,6 +622,10 @@ scan-user-service:
stage: scan-docker stage: scan-docker
needs: needs:
- build-docker - build-docker
only:
refs:
- dev
- master
allow_failure: true allow_failure: true
before_script: before_script:
- docker logout ghcr.io - docker logout ghcr.io
......
dbrepo-gateway-service/Dockerfile deleted 100644 → 0
+ 0
− 7
View file @ f3847755
FROM nginx:alpine AS runtime
MAINTAINER Martin Weise <martin.weise@tuwien.ac.at
COPY ./dbrepo.conf /etc/nginx/conf.d/default.conf
EXPOSE 443
EXPOSE 80
\ No newline at end of file
dbrepo-gateway-service/dbrepo.conf → dbrepo.conf
+ 0
− 0
View file @ c22c1f1d
File moved
docker-compose.dbrepo2.yml
+ 54
− 47
View file @ c22c1f1d
...@@ -49,34 +49,6 @@ services: ...@@ -49,34 +49,6 @@ services:
logging: logging:
driver: json-file driver: json-file
dbrepo-discovery-service:
restart: "no"
container_name: dbrepo-discovery-service
hostname: discovery-service
image: dbrepo/discovery-service:latest
networks:
core:
env_file:
- .env
logging:
driver: json-file
dbrepo-gateway-service:
restart: "no"
container_name: dbrepo-gateway-service
hostname: gateway-service
image: dbrepo/gateway-service:latest
networks:
core:
public:
env_file:
- .env
depends_on:
dbrepo-discovery-service:
condition: service_healthy
logging:
driver: json-file
dbrepo-database-service: dbrepo-database-service:
restart: "no" restart: "no"
container_name: dbrepo-database-service container_name: dbrepo-database-service
...@@ -130,8 +102,6 @@ services: ...@@ -130,8 +102,6 @@ services:
volumes: volumes:
- authentication-service-data:/opt/keycloak/data/ - authentication-service-data:/opt/keycloak/data/
depends_on: depends_on:
dbrepo-discovery-service:
condition: service_healthy
dbrepo-metadata-db: dbrepo-metadata-db:
condition: service_healthy condition: service_healthy
logging: logging:
...@@ -151,7 +121,7 @@ services: ...@@ -151,7 +121,7 @@ services:
- ${SHARED_FILESYSTEM}:/tmp - ${SHARED_FILESYSTEM}:/tmp
depends_on: depends_on:
dbrepo-broker-service: dbrepo-broker-service:
condition: service_started condition: service_healthy
dbrepo-table-service: dbrepo-table-service:
condition: service_healthy condition: service_healthy
dbrepo-authentication-service: dbrepo-authentication-service:
...@@ -160,7 +130,7 @@ services: ...@@ -160,7 +130,7 @@ services:
driver: json-file driver: json-file
dbrepo-table-service: dbrepo-table-service:
restart: "no" restart: on-failure
container_name: dbrepo-table-service container_name: dbrepo-table-service
hostname: table-service hostname: table-service
image: dbrepo/table-service:latest image: dbrepo/table-service:latest
...@@ -178,7 +148,7 @@ services: ...@@ -178,7 +148,7 @@ services:
dbrepo-search-service: dbrepo-search-service:
condition: service_started condition: service_started
dbrepo-broker-service: dbrepo-broker-service:
condition: service_started condition: service_healthy
logging: logging:
driver: json-file driver: json-file
...@@ -221,7 +191,7 @@ services: ...@@ -221,7 +191,7 @@ services:
driver: json-file driver: json-file
dbrepo-analyse-service: dbrepo-analyse-service:
restart: on-failure restart: "no"
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
...@@ -233,9 +203,6 @@ services: ...@@ -233,9 +203,6 @@ services:
volumes: volumes:
- ${SHARED_FILESYSTEM}:/tmp - ${SHARED_FILESYSTEM}:/tmp
- /var/run/docker.sock:/var/run/docker.sock - /var/run/docker.sock:/var/run/docker.sock
depends_on:
dbrepo-discovery-service:
condition: service_healthy
logging: logging:
driver: json-file driver: json-file
...@@ -271,8 +238,6 @@ services: ...@@ -271,8 +238,6 @@ 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:
condition: service_healthy
dbrepo-metadata-db: dbrepo-metadata-db:
condition: service_healthy condition: service_healthy
dbrepo-authentication-service: dbrepo-authentication-service:
...@@ -293,8 +258,6 @@ services: ...@@ -293,8 +258,6 @@ services:
env_file: env_file:
- .env - .env
depends_on: depends_on:
dbrepo-discovery-service:
condition: service_healthy
dbrepo-authentication-service: dbrepo-authentication-service:
condition: service_healthy condition: service_healthy
volumes: volumes:
...@@ -306,16 +269,17 @@ services: ...@@ -306,16 +269,17 @@ services:
restart: always restart: always
container_name: dbrepo-search-service container_name: dbrepo-search-service
hostname: search-service hostname: search-service
image: dbrepo/search-service:latest image: elasticsearch:8.7.1
networks: networks:
core: core:
depends_on:
dbrepo-discovery-service:
condition: service_healthy
ports:
- 9200:9200
env_file: env_file:
- .env - .env
environment:
discovery.type: "single-node"
ES_JAVA_OPTS: "-Xms2g -Xmx2g"
logger.level: "WARN"
bootstrap.memory_lock: "true"
xpack.security.enabled: "true"
volumes: volumes:
- search-service-data:/usr/share/elasticsearch/data - search-service-data:/usr/share/elasticsearch/data
logging: logging:
...@@ -340,3 +304,46 @@ services: ...@@ -340,3 +304,46 @@ services:
condition: service_healthy condition: service_healthy
logging: logging:
driver: json-file driver: json-file
dbrepo-gateway-service:
restart: "no"
container_name: dbrepo-gateway-service
hostname: gateway-service
image: nginx:alpine
networks:
core:
public:
ports:
- "80:80"
- "443:443"
volumes:
- ./dbrepo.conf:/etc/nginx/conf.d/default.conf
depends_on:
dbrepo-analyse-service:
condition: service_healthy
dbrepo-authentication-service:
condition: service_healthy
dbrepo-broker-service:
condition: service_healthy
dbrepo-container-service:
condition: service_healthy
dbrepo-database-service:
condition: service_healthy
dbrepo-identifier-service:
condition: service_healthy
dbrepo-metadata-service:
condition: service_healthy
dbrepo-query-service:
condition: service_healthy
dbrepo-search-service:
condition: service_started
dbrepo-semantics-service:
condition: service_healthy
dbrepo-table-service:
condition: service_healthy
dbrepo-ui:
condition: service_started
dbrepo-user-service:
condition: service_healthy
logging:
driver: json-file
docker-compose.prod.yml
+ 93
− 54
View file @ c22c1f1d
...@@ -8,6 +8,7 @@ volumes: ...@@ -8,6 +8,7 @@ volumes:
metadata-db-data: metadata-db-data:
search-service-data: search-service-data:
broker-service-data: broker-service-data:
authentication-service-data:
networks: networks:
public: public:
...@@ -32,7 +33,7 @@ networks: ...@@ -32,7 +33,7 @@ networks:
services: services:
dbrepo-metadata-db: dbrepo-metadata-db:
restart: on-failure restart: "no"
container_name: dbrepo-metadata-db container_name: dbrepo-metadata-db
hostname: metadata-db hostname: metadata-db
image: dbrepo/metadata-db:1.2 image: dbrepo/metadata-db:1.2
...@@ -48,37 +49,8 @@ services: ...@@ -48,37 +49,8 @@ services:
logging: logging:
driver: json-file driver: json-file
dbrepo-discovery-service:
restart: on-failure
container_name: dbrepo-discovery-service
hostname: discovery-service
image: dbrepo/discovery-service:1.2
networks:
core:
env_file:
- .env
logging:
driver: json-file
dbrepo-gateway-service:
restart: on-failure
container_name: dbrepo-gateway-service
hostname: gateway-service
image: dbrepo/gateway-service:1.2
networks:
core:
ports:
- "80:80"
env_file:
- .env
depends_on:
dbrepo-discovery-service:
condition: service_healthy
logging:
driver: json-file
dbrepo-database-service: dbrepo-database-service:
restart: on-failure restart: "no"
container_name: dbrepo-database-service container_name: dbrepo-database-service
hostname: database-service hostname: database-service
image: dbrepo/database-service:1.2 image: dbrepo/database-service:1.2
...@@ -100,7 +72,7 @@ services: ...@@ -100,7 +72,7 @@ services:
driver: json-file driver: json-file
dbrepo-container-service: dbrepo-container-service:
restart: on-failure restart: "no"
container_name: dbrepo-container-service container_name: dbrepo-container-service
hostname: container-service hostname: container-service
image: dbrepo/container-service:1.2 image: dbrepo/container-service:1.2
...@@ -117,26 +89,27 @@ services: ...@@ -117,26 +89,27 @@ services:
driver: json-file driver: json-file
dbrepo-authentication-service: dbrepo-authentication-service:
restart: on-failure restart: "no"
container_name: dbrepo-authentication-service container_name: dbrepo-authentication-service
hostname: authentication-service hostname: authentication-service
image: dbrepo/authentication-service:1.2 image: dbrepo/authentication-service:1.2
networks: networks:
core: core:
ports:
- "8443:8443"
- "8080:8080"
env_file: env_file:
- .env - .env
volumes:
- authentication-service-data:/opt/keycloak/data/
depends_on: depends_on:
dbrepo-discovery-service:
condition: service_healthy
dbrepo-broker-service:
condition: service_started
dbrepo-metadata-db: dbrepo-metadata-db:
condition: service_healthy condition: service_healthy
logging: logging:
driver: json-file driver: json-file
dbrepo-query-service: dbrepo-query-service:
restart: on-failure restart: "no"
container_name: dbrepo-query-service container_name: dbrepo-query-service
hostname: query-service hostname: query-service
image: dbrepo/query-service:1.2 image: dbrepo/query-service:1.2
...@@ -148,6 +121,8 @@ services: ...@@ -148,6 +121,8 @@ services:
volumes: volumes:
- ${SHARED_FILESYSTEM}:/tmp - ${SHARED_FILESYSTEM}:/tmp
depends_on: depends_on:
dbrepo-broker-service:
condition: service_healthy
dbrepo-table-service: dbrepo-table-service:
condition: service_healthy condition: service_healthy
dbrepo-authentication-service: dbrepo-authentication-service:
...@@ -174,12 +149,12 @@ services: ...@@ -174,12 +149,12 @@ services:
dbrepo-search-service: dbrepo-search-service:
condition: service_started condition: service_started
dbrepo-broker-service: dbrepo-broker-service:
condition: service_started condition: service_healthy
logging: logging:
driver: json-file driver: json-file
dbrepo-identifier-service: dbrepo-identifier-service:
restart: on-failure restart: "no"
container_name: dbrepo-identifier-service container_name: dbrepo-identifier-service
hostname: identifier-service hostname: identifier-service
image: dbrepo/identifier-service:1.2 image: dbrepo/identifier-service:1.2
...@@ -198,7 +173,7 @@ services: ...@@ -198,7 +173,7 @@ services:
driver: json-file driver: json-file
dbrepo-metadata-service: dbrepo-metadata-service:
restart: on-failure restart: "no"
container_name: dbrepo-metadata-service container_name: dbrepo-metadata-service
hostname: metadata-service hostname: metadata-service
image: dbrepo/metadata-service:1.2 image: dbrepo/metadata-service:1.2
...@@ -207,13 +182,15 @@ services: ...@@ -207,13 +182,15 @@ services:
env_file: env_file:
- .env - .env
depends_on: depends_on:
dbrepo-authentication-service:
condition: service_healthy
dbrepo-metadata-db: dbrepo-metadata-db:
condition: service_started condition: service_healthy
logging: logging:
driver: json-file driver: json-file
dbrepo-analyse-service: dbrepo-analyse-service:
restart: on-failure restart: "no"
container_name: dbrepo-analyse-service container_name: dbrepo-analyse-service
hostname: analyse-service hostname: analyse-service
image: dbrepo/analyse-service:1.2 image: dbrepo/analyse-service:1.2
...@@ -225,14 +202,30 @@ services: ...@@ -225,14 +202,30 @@ services:
volumes: volumes:
- ${SHARED_FILESYSTEM}:/tmp - ${SHARED_FILESYSTEM}:/tmp
- /var/run/docker.sock:/var/run/docker.sock - /var/run/docker.sock:/var/run/docker.sock
logging:
driver: json-file
dbrepo-user-service:
restart: "no"
container_name: dbrepo-user-service
hostname: user-service
image: dbrepo/user-service:1.2
networks:
core:
ports:
- "9098:9098"
env_file:
- .env
depends_on: depends_on:
dbrepo-discovery-service: dbrepo-metadata-db:
condition: service_healthy
dbrepo-authentication-service:
condition: service_healthy condition: service_healthy
logging: logging:
driver: json-file driver: json-file
dbrepo-semantics-service: dbrepo-semantics-service:
restart: on-failure restart: "no"
container_name: dbrepo-semantics-service container_name: dbrepo-semantics-service
hostname: semantics-service hostname: semantics-service
image: dbrepo/semantics-service:1.2 image: dbrepo/semantics-service:1.2
...@@ -244,15 +237,15 @@ services: ...@@ -244,15 +237,15 @@ 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:
condition: service_healthy
dbrepo-metadata-db: dbrepo-metadata-db:
condition: service_healthy condition: service_healthy
dbrepo-authentication-service:
condition: service_healthy
logging: logging:
driver: json-file driver: json-file
dbrepo-broker-service: dbrepo-broker-service:
restart: on-failure restart: "no"
container_name: dbrepo-broker-service container_name: dbrepo-broker-service
hostname: broker-service hostname: broker-service
image: dbrepo/broker-service:1.2 image: dbrepo/broker-service:1.2
...@@ -263,7 +256,7 @@ services: ...@@ -263,7 +256,7 @@ services:
env_file: env_file:
- .env - .env
depends_on: depends_on:
dbrepo-discovery-service: dbrepo-authentication-service:
condition: service_healthy condition: service_healthy
volumes: volumes:
- broker-service-data:/var/lib/rabbitmq/ - broker-service-data:/var/lib/rabbitmq/
...@@ -274,21 +267,24 @@ services: ...@@ -274,21 +267,24 @@ services:
restart: always restart: always
container_name: dbrepo-search-service container_name: dbrepo-search-service
hostname: search-service hostname: search-service
image: dbrepo/search-service:1.2 image: elasticsearch:8.7.1
networks: networks:
core: core:
depends_on:
dbrepo-discovery-service:
condition: service_healthy
env_file: env_file:
- .env - .env
environment:
discovery.type: "single-node"
ES_JAVA_OPTS: "-Xms2g -Xmx2g"
logger.level: "WARN"
bootstrap.memory_lock: "true"
xpack.security.enabled: "true"
volumes: volumes:
- search-service-data:/usr/share/elasticsearch/data - search-service-data:/usr/share/elasticsearch/data
logging: logging:
driver: json-file driver: json-file
dbrepo-ui: dbrepo-ui:
restart: on-failure restart: "no"
container_name: dbrepo-ui container_name: dbrepo-ui
hostname: ui hostname: ui
image: dbrepo/ui:1.2 image: dbrepo/ui:1.2
...@@ -308,3 +304,46 @@ services: ...@@ -308,3 +304,46 @@ services:
condition: service_healthy condition: service_healthy
logging: logging:
driver: json-file driver: json-file
dbrepo-gateway-service:
restart: "no"
container_name: dbrepo-gateway-service
hostname: gateway-service
image: nginx:alpine
networks:
core:
public:
ports:
- "80:80"
- "443:443"
volumes:
- ./dbrepo.conf:/etc/nginx/conf.d/default.conf
depends_on:
dbrepo-analyse-service:
condition: service_healthy
dbrepo-authentication-service:
condition: service_healthy
dbrepo-broker-service:
condition: service_healthy
dbrepo-container-service:
condition: service_healthy
dbrepo-database-service:
condition: service_healthy
dbrepo-identifier-service:
condition: service_healthy
dbrepo-metadata-service:
condition: service_healthy
dbrepo-query-service:
condition: service_healthy
dbrepo-search-service:
condition: service_started
dbrepo-semantics-service:
condition: service_healthy
dbrepo-table-service:
condition: service_healthy
dbrepo-ui:
condition: service_started
dbrepo-user-service:
condition: service_healthy
logging:
driver: json-file
docker-compose.yml
+ 3
− 4
View file @ c22c1f1d
...@@ -339,16 +339,15 @@ services: ...@@ -339,16 +339,15 @@ services:
restart: "no" restart: "no"
container_name: dbrepo-gateway-service container_name: dbrepo-gateway-service
hostname: gateway-service hostname: gateway-service
build: ./dbrepo-gateway-service image: nginx:alpine
image: dbrepo-gateway-service
networks: networks:
core: core:
public: public:
ports: ports:
- "80:80" - "80:80"
- "443:443" - "443:443"
env_file: volumes:
- .env - ./dbrepo.conf:/etc/nginx/conf.d/default.conf
depends_on: depends_on:
dbrepo-analyse-service: dbrepo-analyse-service:
condition: service_healthy condition: service_healthy
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment