Skip to content
Snippets Groups Projects
Verified Commit f1bc18c4 authored by Tobias Grantner's avatar Tobias Grantner
Browse files

Propagated changes made in order to remove docker dependency to docker compose files

parent e17bf4eb
No related branches found
No related tags found
6 merge requests!231CI: Remove build for log-service,!228Better error message handling in the frontend,!223Release of version 1.4.0,!177Updated keycloak realms to only allow creation of containers for developers,...,!176Hotfix views,!166Resolve "Independence of deployment environment"
Show whitespace changes
Inline Side-by-side
docker-compose.prod.yml
+ 27
− 17
View file @ f1bc18c4
...@@ -6,17 +6,12 @@ version: "3.6" ...@@ -6,17 +6,12 @@ version: "3.6"
volumes: volumes:
metadata-db-data: metadata-db-data:
user-db-data:
search-db-data: search-db-data:
broker-service-data: broker-service-data:
authentication-service-data: authentication-service-data:
networks: networks:
userdb:
name: userdb
driver: bridge
ipam:
config:
- subnet: 172.30.0.0/16
public: public:
name: public name: public
driver: bridge driver: bridge
...@@ -41,6 +36,7 @@ services: ...@@ -41,6 +36,7 @@ services:
core: core:
volumes: volumes:
- metadata-db-data:/var/lib/mysql - metadata-db-data:/var/lib/mysql
- ./dbrepo-metadata-db/setup-schema_local.sql:/docker-entrypoint-initdb.d/setup-schema_local.sql
ports: ports:
- "3306:3306" - "3306:3306"
- "9100:9100" - "9100:9100"
...@@ -49,20 +45,42 @@ services: ...@@ -49,20 +45,42 @@ services:
logging: logging:
driver: json-file driver: json-file
dbrepo-user-db:
restart: "no"
container_name: dbrepo-user-db
hostname: user-db
image: mariadb:10.5
networks:
core:
volumes:
- user-db-data:/var/lib/mysql
- "/tmp:/tmp"
ports:
- "3307:3306"
- "9101:9100"
env_file:
- .env
environment:
- MARIADB_ROOT_PASSWORD=$USER_DB_PASSWORD
healthcheck:
test: mysqladmin ping --user="$USER_DB_USERNAME" --password="$USER_DB_PASSWORD" --silent
interval: 10s
timeout: 5s
retries: 12
logging:
driver: json-file
dbrepo-database-service: dbrepo-database-service:
restart: "no" restart: "no"
container_name: dbrepo-database-service container_name: dbrepo-database-service
hostname: database-service hostname: database-service
image: dbrepo/database-service:1.3 image: dbrepo/database-service:1.3
networks: networks:
userdb:
core: core:
ports: ports:
- "9092:9092" - "9092:9092"
env_file: env_file:
- .env - .env
volumes:
- /var/run/docker.sock:/var/run/docker.sock
depends_on: depends_on:
dbrepo-container-service: dbrepo-container-service:
condition: service_healthy condition: service_healthy
...@@ -84,8 +102,6 @@ services: ...@@ -84,8 +102,6 @@ services:
- "9091:9091" - "9091:9091"
env_file: env_file:
- .env - .env
volumes:
- /var/run/docker.sock:/var/run/docker.sock
depends_on: depends_on:
dbrepo-authentication-service: dbrepo-authentication-service:
condition: service_healthy condition: service_healthy
...@@ -119,7 +135,6 @@ services: ...@@ -119,7 +135,6 @@ services:
image: dbrepo/query-service:1.3 image: dbrepo/query-service:1.3
networks: networks:
core: core:
userdb:
env_file: env_file:
- .env - .env
volumes: volumes:
...@@ -141,13 +156,11 @@ services: ...@@ -141,13 +156,11 @@ services:
image: dbrepo/table-service:1.3 image: dbrepo/table-service:1.3
networks: networks:
core: core:
userdb:
ports: ports:
- "9094:9094" - "9094:9094"
env_file: env_file:
- .env - .env
volumes: volumes:
- /var/run/docker.sock:/var/run/docker.sock
- ${SHARED_FILESYSTEM}:/tmp - ${SHARED_FILESYSTEM}:/tmp
depends_on: depends_on:
dbrepo-authentication-service: dbrepo-authentication-service:
...@@ -206,12 +219,10 @@ services: ...@@ -206,12 +219,10 @@ services:
image: dbrepo/analyse-service:1.3 image: dbrepo/analyse-service:1.3
networks: networks:
core: core:
userdb:
env_file: env_file:
- .env - .env
volumes: volumes:
- ${SHARED_FILESYSTEM}:/tmp - ${SHARED_FILESYSTEM}:/tmp
- /var/run/docker.sock:/var/run/docker.sock
logging: logging:
driver: json-file driver: json-file
...@@ -247,7 +258,6 @@ services: ...@@ -247,7 +258,6 @@ services:
- .env - .env
volumes: volumes:
- ${SHARED_FILESYSTEM}:/tmp - ${SHARED_FILESYSTEM}:/tmp
- /var/run/docker.sock:/var/run/docker.sock
depends_on: depends_on:
dbrepo-metadata-db: dbrepo-metadata-db:
condition: service_healthy condition: service_healthy
......
docker-compose.yml
+ 27
− 17
View file @ f1bc18c4
...@@ -6,17 +6,12 @@ version: "3.6" ...@@ -6,17 +6,12 @@ version: "3.6"
volumes: volumes:
metadata-db-data: metadata-db-data:
user-db-data:
search-db-data: search-db-data:
broker-service-data: broker-service-data:
authentication-service-data: authentication-service-data:
networks: networks:
userdb:
name: userdb
driver: bridge
ipam:
config:
- subnet: 172.30.0.0/16
public: public:
name: public name: public
driver: bridge driver: bridge
...@@ -42,6 +37,7 @@ services: ...@@ -42,6 +37,7 @@ services:
core: core:
volumes: volumes:
- metadata-db-data:/var/lib/mysql - metadata-db-data:/var/lib/mysql
- ./dbrepo-metadata-db/setup-schema_local.sql:/docker-entrypoint-initdb.d/setup-schema_local.sql
ports: ports:
- "3306:3306" - "3306:3306"
- "9100:9100" - "9100:9100"
...@@ -50,6 +46,31 @@ services: ...@@ -50,6 +46,31 @@ services:
logging: logging:
driver: json-file driver: json-file
dbrepo-user-db:
restart: "no"
container_name: dbrepo-user-db
hostname: user-db
image: mariadb:10.5
networks:
core:
volumes:
- user-db-data:/var/lib/mysql
- "/tmp:/tmp"
ports:
- "3307:3306"
- "9101:9100"
env_file:
- .env
environment:
- MARIADB_ROOT_PASSWORD=$USER_DB_PASSWORD
healthcheck:
test: mysqladmin ping --user="$USER_DB_USERNAME" --password="$USER_DB_PASSWORD" --silent
interval: 10s
timeout: 5s
retries: 12
logging:
driver: json-file
dbrepo-database-service: dbrepo-database-service:
restart: "no" restart: "no"
container_name: dbrepo-database-service container_name: dbrepo-database-service
...@@ -57,14 +78,11 @@ services: ...@@ -57,14 +78,11 @@ services:
build: ./dbrepo-database-service build: ./dbrepo-database-service
image: dbrepo-database-service image: dbrepo-database-service
networks: networks:
userdb:
core: core:
ports: ports:
- "9092:9092" - "9092:9092"
env_file: env_file:
- .env - .env
volumes:
- /var/run/docker.sock:/var/run/docker.sock
depends_on: depends_on:
dbrepo-container-service: dbrepo-container-service:
condition: service_healthy condition: service_healthy
...@@ -89,8 +107,6 @@ services: ...@@ -89,8 +107,6 @@ services:
- "9091:9091" - "9091:9091"
env_file: env_file:
- .env - .env
volumes:
- /var/run/docker.sock:/var/run/docker.sock
depends_on: depends_on:
dbrepo-authentication-service: dbrepo-authentication-service:
condition: service_healthy condition: service_healthy
...@@ -128,7 +144,6 @@ services: ...@@ -128,7 +144,6 @@ services:
image: dbrepo-query-service image: dbrepo-query-service
networks: networks:
core: core:
userdb:
ports: ports:
- "9093:9093" - "9093:9093"
env_file: env_file:
...@@ -155,13 +170,11 @@ services: ...@@ -155,13 +170,11 @@ services:
image: dbrepo-table-service image: dbrepo-table-service
networks: networks:
core: core:
userdb:
ports: ports:
- "9094:9094" - "9094:9094"
env_file: env_file:
- .env - .env
volumes: volumes:
- "/var/run/docker.sock:/var/run/docker.sock"
- "/tmp:/tmp" - "/tmp:/tmp"
depends_on: depends_on:
dbrepo-authentication-service: dbrepo-authentication-service:
...@@ -227,14 +240,12 @@ services: ...@@ -227,14 +240,12 @@ services:
image: dbrepo-analyse-service image: dbrepo-analyse-service
networks: networks:
core: core:
userdb:
ports: ports:
- "5000:5000" - "5000:5000"
env_file: env_file:
- .env - .env
volumes: volumes:
- "/tmp:/tmp" - "/tmp:/tmp"
- /var/run/docker.sock:/var/run/docker.sock
logging: logging:
driver: json-file driver: json-file
...@@ -274,7 +285,6 @@ services: ...@@ -274,7 +285,6 @@ services:
- .env - .env
volumes: volumes:
- "/tmp:/tmp" - "/tmp:/tmp"
- "/var/run/docker.sock:/var/run/docker.sock"
depends_on: depends_on:
dbrepo-metadata-db: dbrepo-metadata-db:
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