From 630c09e872b565153e0f3f264670768e6f2eef12 Mon Sep 17 00:00:00 2001
From: Daniel <d.hornung@indiscale.com>
Date: Thu, 11 May 2023 16:56:39 +0200
Subject: [PATCH] WIP: Rename caosdb -> linkahead
---
.docker/Dockerfile | 11 ++++++-----
.docker/docker-compose.yml | 9 +++++----
.docker/{pycaosdb.ini => pylinkahead.ini} | 4 ++--
3 files changed, 13 insertions(+), 11 deletions(-)
rename .docker/{pycaosdb.ini => pylinkahead.ini} (60%)
diff --git a/.docker/Dockerfile b/.docker/Dockerfile
index 5b26c03c..7126ae08 100644
--- a/.docker/Dockerfile
+++ b/.docker/Dockerfile
@@ -21,14 +21,15 @@ RUN apt-get update && \
COPY .docker/wait-for-it.sh /wait-for-it.sh
ADD https://gitlab.com/api/v4/projects/13656973/repository/branches/dev \
- pylib_version.json
-RUN git clone https://gitlab.com/caosdb/caosdb-pylib.git && \
- cd caosdb-pylib && git checkout dev && pip3 install .
+ pylib_version.json
+# TODO Rename to linkahead, reset to dev branch
+RUN git clone https://gitlab.com/caosdb/caosdb-pylib.git linkahead-pylib && \
+ cd linkahead-pylib && git checkout f-linkahead-rename && pip3 install .
# At least recommonmark 0.6 required.
RUN pip3 install -U html2text pycodestyle pylint recommonmark sphinx-rtd-theme gitignore-parser
COPY . /git
RUN rm -r /git/.git \
- && mv /git/.docker/pycaosdb.ini /git/integrationtests
+ && mv /git/.docker/pylinkahead.ini /git/integrationtests
RUN cd /git && pip3 install .[h5-crawler]
WORKDIR /git/integrationtests
-CMD /wait-for-it.sh caosdb-server:10443 -t 500 -- ./test.sh --force
+CMD /wait-for-it.sh linkahead-server:10443 -t 500 -- ./test.sh --force
diff --git a/.docker/docker-compose.yml b/.docker/docker-compose.yml
index 36964ee6..aa5db139 100644
--- a/.docker/docker-compose.yml
+++ b/.docker/docker-compose.yml
@@ -6,8 +6,9 @@ services:
MYSQL_ROOT_PASSWORD: caosdb1234
networks:
- caosnet
- caosdb-server:
- image: "$CI_REGISTRY/caosdb/src/caosdb-deploy:$CAOSDB_TAG"
+ linkahead-server:
+ # TODO Rename to linkahead
+ image: "$CI_REGISTRY/caosdb/src/caosdb-deploy:$LINKAHEAD_TAG"
user: 999:999
depends_on:
- sqldb
@@ -16,10 +17,10 @@ services:
volumes:
- type: bind
source: "$EXEPATH/.docker/cert"
- target: /opt/caosdb/cert
+ target: /opt/linkahead/cert
- type: bind
source: "$EXEPATH/integrationtests/extroot"
- target: /opt/caosdb/mnt/extroot
+ target: /opt/linkahead/mnt/extroot
read_only: true
ports:
# - "from_outside:from_inside"
diff --git a/.docker/pycaosdb.ini b/.docker/pylinkahead.ini
similarity index 60%
rename from .docker/pycaosdb.ini
rename to .docker/pylinkahead.ini
index 652d5369..3d807f00 100644
--- a/.docker/pycaosdb.ini
+++ b/.docker/pylinkahead.ini
@@ -1,10 +1,10 @@
[IntegrationTests]
-test_server_side_scripting.bin_dir=../caosdb-server/test_scripting/bin/
+test_server_side_scripting.bin_dir=../linkahead-server/test_scripting/bin/
[Connection]
url=https://caosdb-server:10443
username=admin
-cacert=/opt/caosdb/cert/caosdb.cert.pem
+cacert=/opt/linkahead/cert/caosdb.cert.pem
debug=0
password_method=plain
--
GitLab