Merge pull request #2439 from RTXteam/master

Merge master into dev

.gitignore

@@ -51,3 +51,4 @@ code/ARAX/ARAXQuery/Infer/data/xCRG_data/*.pt
 code/ARAX/ARAXQuery/Infer/data/xCRG_data/*.npz
 
 code/UI/OpenAPI/python-flask-server/openapi_server/openapi/openapi.json
+code/UI/OpenAPI/specifications/export/KG2/*/openapi.json

DockerBuild/Merged-Dockerfile → DockerBuild/CICD-Dockerfile

@@ -66,23 +66,3 @@ RUN update-rc.d RTX_Complete defaults
 
 # setup config.domain
 RUN su rt && cd /mnt/data/orangeboard/production/RTX/code/ && echo "Github actions ARAX test suite" > config.domain
-
-# Setup KG2
-
-# clone RTX repo into KG2
-RUN mkdir -p /mnt/data/orangeboard/kg2
-RUN chown -R rt.rt /mnt/data/orangeboard/kg2
-RUN su rt && cd /mnt/data/orangeboard/kg2 && git clone https://github.com/RTXteam/RTX.git
-RUN chown -R rt.rt /mnt/data/orangeboard/kg2/RTX
-COPY kg2-config.js /mnt/data/orangeboard/kg2/RTX/code/UI/interactive/config.js
-
-# setup KG2 services
-RUN export DEVAREA=kg2
-RUN cat /mnt/data/orangeboard/kg2/RTX/code/UI/OpenAPI/python-flask-server/KG2/RTX_OpenAPI_kg2 > /etc/init.d/RTX_OpenAPI_kg2
-RUN chmod 700 /etc/init.d/RTX_OpenAPI_kg2
-RUN update-rc.d RTX_OpenAPI_kg2 defaults
-RUN ln -s /mnt/data/orangeboard/kg2/RTX/code/UI/interactive /var/www/html/kg2
-
-# setup config.domain
-RUN su rt && cd /mnt/data/orangeboard/kg2/RTX/code/ && echo "Github actions ARAX test suite" > config.domain
-

DockerBuild/Dockerfile

@@ -70,4 +70,4 @@ RUN cd /mnt/data/orangeboard/production/RTX/code/autocomplete && sed -i 's/devED
 RUN update-rc.d RTX_Complete defaults
 
 # setup config.domain
-RUN su rt && cd /mnt/data/orangeboard/production/RTX/code/ && echo "arax.ci.transltr.io" > config.domain
+RUN su rt && cd /mnt/data/orangeboard/production/RTX/code/ && echo "arax.ci.transltr.io" > config.domain