[#107] Add configuration of spipes engine within deployments

kbss-cvut · Dec 30, 2024 · a07580d · a07580d
1 parent d899076
commit a07580d
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 5 deletions.
diff --git a/bin/spe.bat b/bin/spe.bat
@@ -39,7 +39,7 @@ for %%A in (%*) do (
 )
 cd %PROJECT_DIR%/deploy
 echo starting s-pipes-editor-ui with scripts %CUSTOM_SCRIPT_PATHS%
-docker-compose --env-file=.env.custom-script-paths up
+docker-compose --env-file=.env up
 :eof
 
 
diff --git a/bin/spe.sh b/bin/spe.sh
@@ -34,6 +34,6 @@ done
 
 
 cd $PROJECT_DIR/deploy
-CUSTOM_SCRIPT_PATHS="$CUSTOM_SCRIPT_PATHS" docker-compose --env-file=.env.custom-script-paths up
+CUSTOM_SCRIPT_PATHS="$CUSTOM_SCRIPT_PATHS" docker-compose --env-file=.env up
 cd
 
diff --git a/deploy/.env b/deploy/.env
@@ -2,3 +2,5 @@
 #PUBLIC_ORIGIN=http://localhost
 #SPIPES_ENGINE=http://s-pipes-engine:8080/s-pipes/
 #SPIPES_EDITOR_REST=s-pipes-editor-rest:18115
+#SHARED_ROOT=/host_mnt
+SPIPES_ENGINE_URL=http://host.docker.internal:8080/s-pipes
diff --git a/deploy/.env.custom-script-paths b/deploy/.env.custom-script-paths
diff --git a/deploy/docker-compose.yml b/deploy/docker-compose.yml
@@ -15,9 +15,12 @@ services:
       NGINX_ENVSUBST_OUTPUT_DIR: "/etc/nginx"
       APP_ORIGIN: "${PUBLIC_ORIGIN:-http://localhost:${INTERNAL_HOST_PORT:-1235}}"
       SPIPES_EDITOR_REST_SERVICE_URL: "${SPIPES_EDITOR_REST:-http://s-pipes-editor-rest:18115}"
+      SPIPES_ENGINE_URL: "${SPIPES_ENGINE_URL:-http://s-pipes-engine:8080/s-pipes}"
     volumes:
       - ./nginx/nginx.conf:/etc/nginx/templates/nginx.conf.template:ro
       - ./nginx/error.html:/usr/share/nginx/html/error.html:ro
+    extra_hosts:
+      - "host.docker.internal:host-gateway"
 
   s-pipes-editor-ui:
     image: "ghcr.io/kbss-cvut/s-pipes-editor-ui/s-pipes-editor-ui:latest"
@@ -41,14 +44,16 @@ services:
     environment:
       SCRIPTPATHS: "${SCRIPTPATHS:-${PWD}/../../s-pipes-modules;${CUSTOM_SCRIPT_PATHS:-${PWD}/../../s-pipes/doc/examples}}"
       SCRIPTRULES: "${SCRIPTRULES:-${PWD}/../../s-pipes-editor/src/main/resources/rules}"
-      ENGINEURL: "${SPIPES_ENGINE:-http://s-pipes-engine:8080/s-pipes}/"
+      ENGINEURL: "${SPIPES_ENGINE_URL:-http://s-pipes-engine:8080/s-pipes}/"
       RDF4J_REPOSITORYURL: "${RDF4J_SERVER_URL:-http://db-server:7200}/repositories"
       RDF4J_REPOSITORYNAME: "${RDF4J_REPOSITORYNAME:-s-pipes-hello-world}"
       RDF4J_PCONFIGURL: "${RDF4J_PCONFIGURL:-./s-pipes-engine/config.ttl}"
     volumes:
       - /tmp:/tmp
       - ${SHARED_ROOT:-/home}:${SHARED_ROOT:-/home}
       - /usr/local/tomcat/temp/:/usr/local/tomcat/temp/
+    extra_hosts:
+      - "host.docker.internal:host-gateway"
 
   s-pipes-engine:
     image: "ghcr.io/kbss-cvut/s-pipes/s-pipes-engine:latest"

diff --git a/deploy/nginx/nginx.conf b/deploy/nginx/nginx.conf
@@ -80,7 +80,7 @@ http
         }
 
         location /services/s-pipes/ {
-             proxy_pass http://s-pipes-engine:8080/;
+             proxy_pass ${SPIPES_ENGINE_URL}/;
         }
 
         location /health-check