From 9e01810e0ef04c4255273c5200ab66b132bc68cf Mon Sep 17 00:00:00 2001 From: cruizba Date: Thu, 22 Sep 2022 16:22:38 +0200 Subject: [PATCH] Update create_image.sh to receive image as an argument --- docker/create_images.sh | 39 ++++++------------- docker/push_images.sh | 2 +- openvidu-basic-node/docker/create_image.sh | 2 +- openvidu-getaroom/docker/create_image.sh | 4 +- .../docker/create_image.sh | 4 +- openvidu-js/docker/create_image.sh | 4 +- openvidu-roles-java/docker/create_image.sh | 4 +- 7 files changed, 21 insertions(+), 38 deletions(-) diff --git a/docker/create_images.sh b/docker/create_images.sh index c6a65e91..fb219060 100755 --- a/docker/create_images.sh +++ b/docker/create_images.sh @@ -12,36 +12,36 @@ pushd .. # Building tutorials # ======================= -# Build openvidu-js-screenshare +# Build openvidu-js-screenshare-demo pushd openvidu-js-screen-share/docker || exit 1 -./create_image.sh "$1" +./create_image.sh "openvidu/openvidu-js-screen-share-demo:$1" popd || exit 1 -# Build openvidu-js-screenshare +# Build openvidu-js-demo pushd openvidu-js/docker || exit 1 -./create_image.sh "$1" +./create_image.sh "openvidu/openvidu-js-demo:$1" popd || exit 1 -# Build openvidu-js-screenshare +# Build openvidu-roles-demo pushd openvidu-roles-java/docker || exit 1 -./create_image.sh "$1" +./create_image.sh "openvidu/openvidu-roles-java-demo:$1" popd || exit 1 -# Build openvidu-js-screenshare +# Build openvidu-getaroom demo pushd openvidu-getaroom/docker || exit 1 -./create_image.sh "$1" +./create_image.sh "openvidu/openvidu-getaroom-demo:$1" popd || exit 1 -# Build openvidu-js-screenshare +# Build openvidu-classroom-demo pushd ../classroom-demo/docker || exit 1 -./create_image.sh "$1" +./create_image.sh "openvidu/openvidu-classroom-demo:$1" popd || exit 1 # ======================= # Building Basic application servers # ======================= pushd openvidu-basic-node/docker || exit 1 -./create_image.sh "$1" +./create_image.sh "openvidu/openvidu-basic-node-demo:$1" popd || exit 1 popd || exit 1 @@ -52,20 +52,3 @@ popd || exit 1 pushd openvidu-demo-proxy || exit 1 ./create_image.sh "$1" popd || exit 1 - -# Retag images for demos -docker tag openvidu/openvidu-js:"$1" openvidu/openvidu-js-demo:"$1" -docker rmi openvidu/openvidu-js:"$1" - -docker tag openvidu/openvidu-js-screen-share:"$1" openvidu/openvidu-js-screen-share-demo:"$1" -docker rmi openvidu/openvidu-js-screen-share:"$1" - -docker tag openvidu/openvidu-roles-java:"$1" openvidu/openvidu-roles-java-demo:"$1" -docker rmi openvidu/openvidu-roles-java:"$1" - -docker tag openvidu/openvidu-getaroom:"$1" openvidu/openvidu-getaroom-demo:"$1" -docker rmi openvidu/openvidu-getaroom:"$1" - -docker tag openvidu/openvidu-basic-node:"$1" openvidu/openvidu-basic-node-demo:"$1" -docker rmi openvidu/openvidu-basic-node:"$1" - diff --git a/docker/push_images.sh b/docker/push_images.sh index aa528b92..3db33dbf 100755 --- a/docker/push_images.sh +++ b/docker/push_images.sh @@ -12,4 +12,4 @@ docker push openvidu/openvidu-roles-java-demo:"$1" docker push openvidu/openvidu-classroom-demo:"$1" docker push openvidu/openvidu-getaroom-demo:"$1" docker push openvidu/openvidu-basic-node-demo:"$1" -docker push openvidu/openvidu-demo-proxy:"$1" \ No newline at end of file +docker push openvidu/openvidu-demo-proxy:"$1" diff --git a/openvidu-basic-node/docker/create_image.sh b/openvidu-basic-node/docker/create_image.sh index d8c8a9f3..66b0a40f 100755 --- a/openvidu-basic-node/docker/create_image.sh +++ b/openvidu-basic-node/docker/create_image.sh @@ -6,4 +6,4 @@ fi pushd ../ -docker build --pull --no-cache --rm=true -f docker/Dockerfile -t openvidu/openvidu-basic-node:"$1" . \ No newline at end of file +docker build --pull --no-cache --rm=true -f docker/Dockerfile -t "$1" . \ No newline at end of file diff --git a/openvidu-getaroom/docker/create_image.sh b/openvidu-getaroom/docker/create_image.sh index af3dfbd0..e7a4949f 100755 --- a/openvidu-getaroom/docker/create_image.sh +++ b/openvidu-getaroom/docker/create_image.sh @@ -1,6 +1,6 @@ #!/bin/bash if [ $# -eq 0 ]; then - echo "No version argument provided. Usage: \"./create_image.sh X.Y.Z\"" + echo "No version argument provided. Usage: \"./create_image.sh \"" exit 1 fi @@ -10,6 +10,6 @@ cp -r ../openvidu-basic-node . trap 'rm -rf ./openvidu-basic-node' ERR -docker build --pull --no-cache --rm=true -f docker/Dockerfile -t openvidu/openvidu-getaroom:"${1}" . +docker build --pull --no-cache --rm=true -f docker/Dockerfile -t "$1" . rm -rf ./openvidu-basic-node \ No newline at end of file diff --git a/openvidu-js-screen-share/docker/create_image.sh b/openvidu-js-screen-share/docker/create_image.sh index 5d36c967..e7a4949f 100755 --- a/openvidu-js-screen-share/docker/create_image.sh +++ b/openvidu-js-screen-share/docker/create_image.sh @@ -1,6 +1,6 @@ #!/bin/bash if [ $# -eq 0 ]; then - echo "No version argument provided. Usage: \"./create_image.sh X.Y.Z\"" + echo "No version argument provided. Usage: \"./create_image.sh \"" exit 1 fi @@ -10,6 +10,6 @@ cp -r ../openvidu-basic-node . trap 'rm -rf ./openvidu-basic-node' ERR -docker build --pull --no-cache --rm=true -f docker/Dockerfile -t openvidu/openvidu-js-screen-share:"$1" . +docker build --pull --no-cache --rm=true -f docker/Dockerfile -t "$1" . rm -rf ./openvidu-basic-node \ No newline at end of file diff --git a/openvidu-js/docker/create_image.sh b/openvidu-js/docker/create_image.sh index 8588d228..e7a4949f 100755 --- a/openvidu-js/docker/create_image.sh +++ b/openvidu-js/docker/create_image.sh @@ -1,6 +1,6 @@ #!/bin/bash if [ $# -eq 0 ]; then - echo "No version argument provided. Usage: \"./create_image.sh X.Y.Z\"" + echo "No version argument provided. Usage: \"./create_image.sh \"" exit 1 fi @@ -10,6 +10,6 @@ cp -r ../openvidu-basic-node . trap 'rm -rf ./openvidu-basic-node' ERR -docker build --pull --no-cache --rm=true -f docker/Dockerfile -t openvidu/openvidu-js:"$1" . +docker build --pull --no-cache --rm=true -f docker/Dockerfile -t "$1" . rm -rf ./openvidu-basic-node \ No newline at end of file diff --git a/openvidu-roles-java/docker/create_image.sh b/openvidu-roles-java/docker/create_image.sh index 9f024cf1..7555abd5 100755 --- a/openvidu-roles-java/docker/create_image.sh +++ b/openvidu-roles-java/docker/create_image.sh @@ -1,8 +1,8 @@ #!/bin/bash if [ $# -eq 0 ]; then - echo "No version argument provided. Usage: \"./create_image.sh X.Y.Z\"" + echo "No version argument provided. Usage: \"./create_image.sh \"" exit 1 fi pushd ../ -docker build -f docker/Dockerfile -t openvidu/openvidu-roles-java:"${1}" . \ No newline at end of file +docker build -f docker/Dockerfile -t "$1" . \ No newline at end of file