diff --git a/docker/openvidu-demo-proxy/conf/default.conf b/docker/openvidu-demo-proxy/conf/default.conf index b56035b7..c9d93591 100644 --- a/docker/openvidu-demo-proxy/conf/default.conf +++ b/docker/openvidu-demo-proxy/conf/default.conf @@ -23,8 +23,7 @@ server { {{ redirect_index_to_domain }} - location /api { - rewrite /api(.*) /$1 break; + location /api/ { proxy_pass url_application_server; } diff --git a/docker/openvidu-demos-docker-compose/docker-compose.yml b/docker/openvidu-demos-docker-compose/docker-compose.yml index bce76191..2c687e9c 100644 --- a/docker/openvidu-demos-docker-compose/docker-compose.yml +++ b/docker/openvidu-demos-docker-compose/docker-compose.yml @@ -8,6 +8,7 @@ services: environment: - OPENVIDU_URL=https://${DOMAIN_OR_PUBLIC_IP:-}:${HTTPS_PORT:-443} - OPENVIDU_SECRET=${OPENVIDU_SECRET:-} + - OPENVIDU_APPLICATION_SERVER_URL=https://${DOMAIN_OR_PUBLIC_IP:-}:${HTTPS_PORT:-443} openvidu-js-demo: image: openvidu/openvidu-js-demo:2.23.0 @@ -15,6 +16,7 @@ services: environment: - OPENVIDU_URL=https://${DOMAIN_OR_PUBLIC_IP:-}:${HTTPS_PORT:-443} - OPENVIDU_SECRET=${OPENVIDU_SECRET:-} + - OPENVIDU_APPLICATION_SERVER_URL=https://${DOMAIN_OR_PUBLIC_IP:-}:${HTTPS_PORT:-443} openvidu-roles-java-demo: image: openvidu/openvidu-roles-java-demo:2.23.0 @@ -36,6 +38,7 @@ services: environment: - OPENVIDU_URL=https://${DOMAIN_OR_PUBLIC_IP:-}:${HTTPS_PORT:-443} - OPENVIDU_SECRET=${OPENVIDU_SECRET:-} + - OPENVIDU_APPLICATION_SERVER_URL=https://${DOMAIN_OR_PUBLIC_IP:-}:${HTTPS_PORT:-443} openvidu-call: image: openvidu/openvidu-call:2.23.0-demos diff --git a/openvidu-getaroom/docker/Dockerfile b/openvidu-getaroom/docker/Dockerfile index 893a371d..38dde55a 100644 --- a/openvidu-getaroom/docker/Dockerfile +++ b/openvidu-getaroom/docker/Dockerfile @@ -12,4 +12,6 @@ COPY ./web /opt/openvidu-basic-node/public WORKDIR /opt/openvidu-basic-node -ENTRYPOINT [ "node", "index.js" ] \ No newline at end of file +COPY docker/entrypoint.sh . + +ENTRYPOINT [ "./entrypoint.sh" ] \ No newline at end of file diff --git a/openvidu-getaroom/docker/entrypoint.sh b/openvidu-getaroom/docker/entrypoint.sh new file mode 100755 index 00000000..8b13828b --- /dev/null +++ b/openvidu-getaroom/docker/entrypoint.sh @@ -0,0 +1,10 @@ +#!/bin/sh + +if [ -n "${OPENVIDU_APPLICATION_SERVER_URL}" ]; then + # Replace OPENVIDU_APPLICATION_SERVER_URL at frontend app + sed -i \ + "s|var APPLICATION_SERVER_URL = \"http://localhost:5000/\";|var APPLICATION_SERVER_URL = \"${OPENVIDU_APPLICATION_SERVER_URL}/\";|" \ + public/app.js +fi + +exec node index.js "$*" \ No newline at end of file diff --git a/openvidu-js-screen-share/docker/Dockerfile b/openvidu-js-screen-share/docker/Dockerfile index 893a371d..38dde55a 100644 --- a/openvidu-js-screen-share/docker/Dockerfile +++ b/openvidu-js-screen-share/docker/Dockerfile @@ -12,4 +12,6 @@ COPY ./web /opt/openvidu-basic-node/public WORKDIR /opt/openvidu-basic-node -ENTRYPOINT [ "node", "index.js" ] \ No newline at end of file +COPY docker/entrypoint.sh . + +ENTRYPOINT [ "./entrypoint.sh" ] \ No newline at end of file diff --git a/openvidu-js-screen-share/docker/entrypoint.sh b/openvidu-js-screen-share/docker/entrypoint.sh new file mode 100755 index 00000000..8b13828b --- /dev/null +++ b/openvidu-js-screen-share/docker/entrypoint.sh @@ -0,0 +1,10 @@ +#!/bin/sh + +if [ -n "${OPENVIDU_APPLICATION_SERVER_URL}" ]; then + # Replace OPENVIDU_APPLICATION_SERVER_URL at frontend app + sed -i \ + "s|var APPLICATION_SERVER_URL = \"http://localhost:5000/\";|var APPLICATION_SERVER_URL = \"${OPENVIDU_APPLICATION_SERVER_URL}/\";|" \ + public/app.js +fi + +exec node index.js "$*" \ No newline at end of file diff --git a/openvidu-js/docker/Dockerfile b/openvidu-js/docker/Dockerfile index 893a371d..38dde55a 100644 --- a/openvidu-js/docker/Dockerfile +++ b/openvidu-js/docker/Dockerfile @@ -12,4 +12,6 @@ COPY ./web /opt/openvidu-basic-node/public WORKDIR /opt/openvidu-basic-node -ENTRYPOINT [ "node", "index.js" ] \ No newline at end of file +COPY docker/entrypoint.sh . + +ENTRYPOINT [ "./entrypoint.sh" ] \ No newline at end of file diff --git a/openvidu-js/docker/entrypoint.sh b/openvidu-js/docker/entrypoint.sh new file mode 100755 index 00000000..8b13828b --- /dev/null +++ b/openvidu-js/docker/entrypoint.sh @@ -0,0 +1,10 @@ +#!/bin/sh + +if [ -n "${OPENVIDU_APPLICATION_SERVER_URL}" ]; then + # Replace OPENVIDU_APPLICATION_SERVER_URL at frontend app + sed -i \ + "s|var APPLICATION_SERVER_URL = \"http://localhost:5000/\";|var APPLICATION_SERVER_URL = \"${OPENVIDU_APPLICATION_SERVER_URL}/\";|" \ + public/app.js +fi + +exec node index.js "$*" \ No newline at end of file