diff --git a/openvidu-js-java/docker/Dockerfile b/openvidu-js-java/docker/Dockerfile index fbd491c5..8b97b5cc 100644 --- a/openvidu-js-java/docker/Dockerfile +++ b/openvidu-js-java/docker/Dockerfile @@ -32,7 +32,7 @@ COPY supervisord.conf /etc/supervisor/conf.d/supervisord.conf RUN apt-get update && apt-get install -y supervisor && rm -rf /var/lib/apt/lists/* COPY openvidu-server.jar openvidu-server.jar -COPY openvidu-sample-secure.jar app.jar +COPY openvidu-js-java.jar app.jar RUN sh -c 'touch /openvidu-server.jar' RUN sh -c 'touch /app.jar' diff --git a/openvidu-js-java/docker/create_image.sh b/openvidu-js-java/docker/create_image.sh index 6bf9f263..e5c83d6f 100755 --- a/openvidu-js-java/docker/create_image.sh +++ b/openvidu-js-java/docker/create_image.sh @@ -1,33 +1,15 @@ -### openvidu-js-java ### - -# Build and package maven project +# Build and package openvidu-js-java maven project cd .. && mvn clean compile package -# Copy jar in docker build path -cp target/openvidu-js-java-"$1".jar docker/openvidu-sample-secure.jar - - - -### openvidu-server ### - -# Copy openvidu-server project in docker build path except angular-cli project ('frontend' folder) -cd docker -rsync -ax --exclude='**/angular' ../../../openvidu/openvidu-server . - -# Build and package maven project -cd openvidu-server && mvn clean compile package -DskipTests=true - -# Copy openvidu.server.jar in docker build path -cp target/openvidu-server-"$1".jar ../openvidu-server.jar - +# Copy openvidu-js-java.jar in docker build path +cp target/openvidu-js-java-"$1".jar ./docker/openvidu-js-java.jar +# Copy compiled openvidu-server.jar +cd ./docker && cp ../../../openvidu/openvidu-server/target/openvidu-server-"$1".jar ./openvidu-server.jar ### Build Docker container and remove unwanted files ### - -cd .. - docker build -t openvidu/basic-webinar-demo . -rm ./openvidu-sample-secure.jar +rm ./openvidu-js-java.jar rm ./openvidu-server.jar rm -rf ./openvidu-server