diff --git a/bin/spe.bat b/bin/spe.bat index 0823472..3e741ae 100644 --- 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 index 5176427..4323b88 100755 --- 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 index 2502236..c06c8a2 100644 --- 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 deleted file mode 100644 index da591a9..0000000 --- a/deploy/.env.custom-script-paths +++ /dev/null @@ -1 +0,0 @@ -#SHARED_ROOT=/host_mnt diff --git a/deploy/docker-compose.yml b/deploy/docker-compose.yml index 2f4cead..a9adac4 100644 --- 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,7 +44,7 @@ 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}" @@ -49,6 +52,8 @@ services: - /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 index 98f2db6..baf73fa 100644 --- 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