From 618708e55b00eca3c994d56e674a5e450eb33dde Mon Sep 17 00:00:00 2001
From: Martin Weise <martin.weise@tuwien.ac.at>
Date: Thu, 23 Jan 2025 18:10:28 +0100
Subject: [PATCH] Fixed lint
Signed-off-by: Martin Weise <martin.weise@tuwien.ac.at>
---
.docker/docker-compose.yml | 4 ++--
.gitlab-ci.yml | 9 +++++----
docker-compose.yml | 2 +-
3 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/.docker/docker-compose.yml b/.docker/docker-compose.yml
index b6a7478e82..2db8fc6185 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 4e4c751bf4..43b8b17a6f 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 5a0d1a4242..ad1dacb6b7 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
--
GitLab