From 8f97bdaba70ba31c50f41173e3e520dfb0101e11 Mon Sep 17 00:00:00 2001 From: Joscha Schmiedt <joscha@schmiedt.dev> Date: Thu, 5 Sep 2024 09:07:11 +0200 Subject: [PATCH] CHG: Use linkahead-client.json Use LINKAHEAD_CLIENT_CONFIGURATION instead of CAOSDB_CLIENT_CONFIGURATION --- .docker/Dockerfile | 1 + .docker/linkahead-client.json | 14 ++++++++++++++ .docker/tester.yml | 2 +- 3 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 .docker/linkahead-client.json diff --git a/.docker/Dockerfile b/.docker/Dockerfile index efd33f3..255c3b7 100644 --- a/.docker/Dockerfile +++ b/.docker/Dockerfile @@ -13,6 +13,7 @@ WORKDIR /caosdb-cppinttest RUN rm -rf .git COPY .docker/caosdb-client.json /caosdb-client.json +COPY .docker/linkahead-client.json /linkahead-client.json # Build and run tests. # If no other command is given to the Docker image diff --git a/.docker/linkahead-client.json b/.docker/linkahead-client.json new file mode 100644 index 0000000..5da162e --- /dev/null +++ b/.docker/linkahead-client.json @@ -0,0 +1,14 @@ +{ + "connections": { + "default": { + "host": "caosdb-server", + "port": 8443, + "server_certificate_path": "/cert/caosdb.cert.pem", + "authentication": { + "type": "plain", + "username": "admin", + "password": "caosdb" + } + } + } +} diff --git a/.docker/tester.yml b/.docker/tester.yml index 764fcd6..f9010d5 100644 --- a/.docker/tester.yml +++ b/.docker/tester.yml @@ -5,7 +5,7 @@ services: environment: CAOSDB_SERVER_HOST: caosdb-server CAOSDB_SERVER_CERT: /cert/caosdb.cert.pem - CAOSDB_CLIENT_CONFIGURATION: /caosdb-client.json + LINKAHEAD_CLIENT_CONFIGURATION: /linkahead-client.json networks: - docker_caosnet volumes: -- GitLab