diff --git a/tests/CI/docker-compose.yml b/tests/CI/docker-compose.yml index 86587dbd3a2..24a8eb83d96 100644 --- a/tests/CI/docker-compose.yml +++ b/tests/CI/docker-compose.yml @@ -91,53 +91,53 @@ services: - diracx-init-key: - image: gitlab-registry.cern.ch/chaen/chrissquare-hack-a-ton/diracx - container_name: diracx-init-key - environment: - - DIRACX_SERVICE_AUTH_TOKEN_KEY="file:///signing-key/rs256.key" - volumes: - - diracx-key-store:/signing-key/ - entrypoint: | - /dockerMicroMambaEntrypoint.sh ssh-keygen -P '' -trsa -b4096 -mPEM -f/signing-key/rs256.key + # diracx-init-key: + # image: gitlab-registry.cern.ch/chaen/chrissquare-hack-a-ton/diracx + # container_name: diracx-init-key + # environment: + # - DIRACX_SERVICE_AUTH_TOKEN_KEY="file:///signing-key/rs256.key" + # volumes: + # - diracx-key-store:/signing-key/ + # entrypoint: | + # /dockerMicroMambaEntrypoint.sh ssh-keygen -P '' -trsa -b4096 -mPEM -f/signing-key/rs256.key - diracx-init-cs: - image: gitlab-registry.cern.ch/chaen/chrissquare-hack-a-ton/diracx - container_name: diracx-init-cs - environment: - - DIRACX_CONFIG_BACKEND_URL=git+file:///cs_store/initialRepo - - DIRACX_SERVICE_AUTH_TOKEN_KEY=file:///signing-key/rs256.key - volumes: - - diracx-cs-store:/cs_store/ - - diracx-key-store:/signing-key/ - entrypoint: | - /dockerMicroMambaEntrypoint.sh dirac internal generate-cs /cs_store/initialRepo --vo=diracAdmin --user-group=admin --idp-url=http://dsdsd.csds/a/b + # diracx-init-cs: + # image: gitlab-registry.cern.ch/chaen/chrissquare-hack-a-ton/diracx + # container_name: diracx-init-cs + # environment: + # - DIRACX_CONFIG_BACKEND_URL=git+file:///cs_store/initialRepo + # - DIRACX_SERVICE_AUTH_TOKEN_KEY=file:///signing-key/rs256.key + # volumes: + # - diracx-cs-store:/cs_store/ + # - diracx-key-store:/signing-key/ + # entrypoint: | + # /dockerMicroMambaEntrypoint.sh dirac internal generate-cs /cs_store/initialRepo --vo=diracAdmin --user-group=admin --idp-url=http://dsdsd.csds/a/b - diracx: - image: gitlab-registry.cern.ch/chaen/chrissquare-hack-a-ton/diracx - container_name: diracx - environment: - - DIRACX_CONFIG_BACKEND_URL=git+file:///cs_store/initialRepo - - "DIRACX_DB_URL_AUTHDB=sqlite+aiosqlite:///:memory:" - # - DIRACX_DB_URL_JOBDB=mysql+aiomysql://Dirac:Dirac@mysql:3306/JobBD - - "DIRACX_DB_URL_JOBDB=sqlite+aiosqlite:///:memory:" - - DIRACX_SERVICE_AUTH_TOKEN_KEY=file:///signing-key/rs256.key - - DIRACX_SERVICE_AUTH_ALLOWED_REDIRECTS=["http://pclhcb211:8000/docs/oauth2-redirect"] - ports: - - 8000:8000 - depends_on: - diracx-init-cs: - condition: service_completed_successfully # Let the init container create the cs - diracx-init-key: - condition: service_completed_successfully # Let the init container create the cs - volumes: - - diracx-cs-store:/cs_store/ - - diracx-key-store:/signing-key/ - # entrypoint: sleep 1000 + # diracx: + # image: gitlab-registry.cern.ch/chaen/chrissquare-hack-a-ton/diracx + # container_name: diracx + # environment: + # - DIRACX_CONFIG_BACKEND_URL=git+file:///cs_store/initialRepo + # - "DIRACX_DB_URL_AUTHDB=sqlite+aiosqlite:///:memory:" + # # - DIRACX_DB_URL_JOBDB=mysql+aiomysql://Dirac:Dirac@mysql:3306/JobBD + # - "DIRACX_DB_URL_JOBDB=sqlite+aiosqlite:///:memory:" + # - DIRACX_SERVICE_AUTH_TOKEN_KEY=file:///signing-key/rs256.key + # - DIRACX_SERVICE_AUTH_ALLOWED_REDIRECTS=["http://pclhcb211:8000/docs/oauth2-redirect"] + # ports: + # - 8000:8000 + # depends_on: + # diracx-init-cs: + # condition: service_completed_successfully # Let the init container create the cs + # diracx-init-key: + # condition: service_completed_successfully # Let the init container create the cs + # volumes: + # - diracx-cs-store:/cs_store/ + # - diracx-key-store:/signing-key/ + # # entrypoint: sleep 1000 - healthcheck: - test: ["CMD", "/dockerMicroMambaEntrypoint.sh", "curl", "-f", "http://localhost:8000/.well-known/openid-configuration"] - interval: 5s - timeout: 2s - retries: 15 - start_period: 60s + # healthcheck: + # test: ["CMD", "/dockerMicroMambaEntrypoint.sh", "curl", "-f", "http://localhost:8000/.well-known/openid-configuration"] + # interval: 5s + # timeout: 2s + # retries: 15 + # start_period: 60s