diff --git a/OMAF-Sample/README.md b/OMAF-Sample/README.md index ad1ec64..7f7ba34 100755 --- a/OMAF-Sample/README.md +++ b/OMAF-Sample/README.md @@ -33,8 +33,8 @@ make build -j $(nproc) docker image ls # REPOSITORY TAG - # immersive-server v1.10 - # immersive-server-base v1.10 + # immersive-server v1.12 + # immersive-server-base v1.12 ``` - Client : @@ -46,7 +46,7 @@ - Server : ```bash - docker run --privileged -p 30001:443 -p 30002:8080 -it immersive-server:v1.10 bash # Map the port. + docker run --privileged -p 30001:443 -p 30002:8080 -it immersive-server:v1.12 bash # Map the port. cd /usr/local/nginx/conf/ ./configure.sh CN Shanghai A B C D E@F.com # './configure.sh -h' for details. /usr/local/nginx/sbin/nginx # Start nginx. diff --git a/OMAF-Sample/server/deploy.sh b/OMAF-Sample/server/deploy.sh index 2b947cd..7a6b484 100755 --- a/OMAF-Sample/server/deploy.sh +++ b/OMAF-Sample/server/deploy.sh @@ -1,14 +1,14 @@ #!/bin/bash -ex -parameters_usage(){ - echo 'Usage: 1. : original file path' - echo ' 2. : proxy setting. [optional]' +parameters_usage() { + echo 'Usage: 1. : original file path' + echo ' 2. : proxy setting. [optional]' } -REPOPATH=`echo $1 | awk -F "OMAF-Sample" '{print $1}'` +REPOPATH=$(echo $1 | awk -F "OMAF-Sample" '{print $1}') SRCPATH="${REPOPATH}src/" DSTPATH="${REPOPATH}OMAF-Sample/server/src/" -VERSION="v1.10" +VERSION="v1.12" IMAGEPREFIX="immersive-server" BASETAG="${IMAGEPREFIX}-base:${VERSION}" RUNTIMETAG="${IMAGEPREFIX}:${VERSION}" @@ -29,29 +29,29 @@ cp -r ${SRCPATH}OmafDashAccess ${DSTPATH} cp -r ${SRCPATH}CMakeLists.txt ${DSTPATH} cp -r ${REPOPATH}Sample-Videos ${DSTPATH} -if [ $# = 2 ] ; then - if [ "$1" = "-h" ] ; then - parameters_usage - else - PROXY=$2 - PROXYARGS="--build-arg http_proxy=${PROXY} "` - `"--build-arg https_proxy=${PROXY}" - echo "PROXY:${PROXY}" - fi -elif [ $# = 1 ] ; then - PROXYARGS="" +if [ $# = 2 ]; then + if [ "$1" = "-h" ]; then + parameters_usage + else + PROXY=$2 + PROXYARGS="--build-arg http_proxy=${PROXY} "$( + )"--build-arg https_proxy=${PROXY}" + echo "PROXY:${PROXY}" + fi +elif [ $# = 1 ]; then + PROXYARGS="" else - parameters_usage - exit 0 + parameters_usage + exit 0 fi DOCKER_BUILDKIT=1 docker build ${PROXYARGS} \ - --tag ${BASETAG} \ - --file Dockerfile.base . + --tag ${BASETAG} \ + --file Dockerfile.base . DOCKER_BUILDKIT=1 docker build ${PROXYARGS} \ - --tag ${RUNTIMETAG} \ - --build-arg "base_image=${BASETAG}" \ - --file Dockerfile.runtime . + --tag ${RUNTIMETAG} \ + --build-arg "base_image=${BASETAG}" \ + --file Dockerfile.runtime . rm -rf ${DSTPATH} diff --git a/OMAF-Sample/server/deploy.yaml b/OMAF-Sample/server/deploy.yaml index 2bc3fad..de70f4a 100644 --- a/OMAF-Sample/server/deploy.yaml +++ b/OMAF-Sample/server/deploy.yaml @@ -17,7 +17,7 @@ spec: enableServiceLinks: false containers: - name: immersive-server - image: immersive_server:v1.10 + image: immersive_server:v1.12 command: [ "/bin/sh","-c" ] args: - cd /usr/local/nginx/conf/ && diff --git a/README.md b/README.md index 758ed65..4c7e75e 100755 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ # Open Visual Cloud Immersive Video Samples [![Travis Build Status](https://travis-ci.com/OpenVisualCloud/Immersive-Video-Sample.svg?branch=master)](https://travis-ci.com/OpenVisualCloud/Immersive-Video-Sample) -[![Stable release](https://img.shields.io/badge/latest_release-v1.10.0-green.svg)](https://github.com/OpenVisualCloud/Immersive-Video-Sample/releases/latest) +[![Stable release](https://img.shields.io/badge/latest_release-v1.12.0-green.svg)](https://github.com/OpenVisualCloud/Immersive-Video-Sample/releases/latest) [![Contributions](https://img.shields.io/badge/contributions-welcome-blue.svg)](https://github.com/OpenVisualCloud/Immersive-Video-Sample/wiki) This Immersive Video project includes 2 samples which are based on different streaming frameworks.