diff --git a/.docker/docker-compose.yml b/.docker/docker-compose.yml index b6a7478e82c5dec1c44d97f339d0ed0e7276d718..2db8fc6185c54f0595c7b170273d8d9778252712 100644 --- a/.docker/docker-compose.yml +++ b/.docker/docker-compose.yml @@ -88,13 +88,12 @@ services: environment: KEYCLOAK_ENABLE_HTTPS: "false" KEYCLOAK_ENABLE_STATISTICS: "true" - KEYCLOAK_ENABLE_HEALTH_ENDPOINTS: "true" KEYCLOAK_DATABASE_HOST: "auth-db" KEYCLOAK_DATABASE_NAME: "${AUTH_DB_NAME:-keycloak}" KEYCLOAK_DATABASE_USER: "${AUTH_DB_USERNAME:-keycloak}" KEYCLOAK_DATABASE_PASSWORD: "${AUTH_DB_PASSWORD:-dbrepo}" healthcheck: - test: curl --head -fsS http://localhost:9000/health/ready + test: curl -fsS http://localhost:8080/realms/master interval: 10s timeout: 5s retries: 12 @@ -109,6 +108,7 @@ services: dbrepo-auth-service-init: init: true restart: "no" + container_name: dbrepo-auth-service-init image: registry.datalab.tuwien.ac.at/dbrepo/metadata-service:1.6.2 environment: AUTH_SERVICE_ADMIN: ${AUTH_SERVICE_ADMIN:-admin} diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4e4c751bf4f815c23adcce33ee2a8b237b3fe8b8..43b8b17a6f1564e18327d88576d5168f1f2a6e41 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -55,22 +55,23 @@ lint-docker-compose: - "IGNORE_IMAGE=1 IGNORE_PORTS=1 bash .scripts/check-service.sh 'dbrepo-analyse-service'" - "IGNORE_PORTS=1 bash .scripts/check-service.sh 'dbrepo-auth-db'" - "IGNORE_IMAGE=1 IGNORE_PORTS=1 bash .scripts/check-service.sh 'dbrepo-auth-service'" + - "IGNORE_VOLUMES=1 IGNORE_IMAGE=1 bash .scripts/check-service.sh 'dbrepo-auth-service-init'" - "IGNORE_IMAGE=1 IGNORE_PORTS=1 bash .scripts/check-service.sh 'dbrepo-broker-service'" - "IGNORE_PORTS=1 bash .scripts/check-service.sh 'dbrepo-dashboard-service'" - "bash .scripts/check-service.sh 'dbrepo-data-db'" - "IGNORE_IMAGE=1 IGNORE_PORTS=1 bash .scripts/check-service.sh 'dbrepo-data-service'" - "IGNORE_VOLUMES=1 bash .scripts/check-service.sh 'dbrepo-gateway-service'" - - "IGNORE_VOLUMES=1 bash .scripts/check-service.sh 'dbrepo-identity-service'" + - "IGNORE_VOLUMES=1 IGNORE_PORTS=1 bash .scripts/check-service.sh 'dbrepo-identity-service'" - "IGNORE_VOLUMES=1 bash .scripts/check-service.sh 'dbrepo-metadata-db'" - "IGNORE_IMAGE=1 IGNORE_PORTS=1 bash .scripts/check-service.sh 'dbrepo-metadata-service'" - - "IGNORE_VOLUMES=1 bash .scripts/check-service.sh 'dbrepo-metric-db'" + - "IGNORE_VOLUMES=1 IGNORE_PORTS=1 bash .scripts/check-service.sh 'dbrepo-metric-db'" - "IGNORE_IMAGE=1 bash .scripts/check-service.sh 'dbrepo-search-db'" - "IGNORE_IMAGE=1 IGNORE_PORTS=1 bash .scripts/check-service.sh 'dbrepo-search-service'" - "IGNORE_IMAGE=1 bash .scripts/check-service.sh 'dbrepo-search-service-init'" - "IGNORE_VOLUMES=1 bash .scripts/check-service.sh 'dbrepo-storage-service'" - - "IGNORE_VOLUMES=1 bash .scripts/check-service.sh 'dbrepo-storage-service-init'" + - "IGNORE_VOLUMES=1 IGNORE_IMAGE=1 bash .scripts/check-service.sh 'dbrepo-storage-service-init'" - "IGNORE_IMAGE=1 bash .scripts/check-service.sh 'dbrepo-ui'" - - "bash .scripts/check-service.sh 'dbrepo-upload-service'" + - "IGNORE_VOLUMES=1 bash .scripts/check-service.sh 'dbrepo-upload-service'" lint-helm-chart: image: docker.io/alpine:${ALPINE_VERSION} diff --git a/docker-compose.yml b/docker-compose.yml index 5a0d1a4242d9ca2f7f0f8cd97617def35e65cd6a..ad1dacb6b7b19a8fb4ee3303968cd684bef75967 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -110,8 +110,8 @@ services: dbrepo-auth-service-init: init: true restart: "no" - image: dbrepo-auth-service-init:latest container_name: dbrepo-auth-service-init + image: dbrepo-auth-service-init:latest build: context: ./dbrepo-auth-service/init network: host