Merge pull request #64 from lodygens/12.2.5-dockerbug

12.2.4 : docker bug correction: user command line args must be used ;)
lodygens · Jan 17, 2018 · b152b95 · b152b95
2 parents f8289ce + c06649a
commit b152b95
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 14 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -1 +1 @@
-version=12.2.4
+version=12.2.5
diff --git a/src/main/resources/docker/client/Dockerfile b/src/main/resources/docker/client/Dockerfile
@@ -38,7 +38,7 @@ LABEL description="This creates a Docker image for the XWHEP client"
 
 EXPOSE 4327
 
-ENV XWVERSION "12.2.4"
+ENV XWVERSION "12.2.5"
 
 
 RUN apt-get update

diff --git a/src/main/resources/docker/master/Dockerfile b/src/main/resources/docker/master/Dockerfile
@@ -42,7 +42,7 @@ LABEL version="0.4"
 LABEL description="This downloads and compiles XWHEP server"
 EXPOSE 4321 4322 4323 443
 
-ENV XWVERSION "12.2.4"
+ENV XWVERSION "12.2.5"
 
 # next is only to check file is present
 # before getting time to apt-get update etc.

diff --git a/src/main/resources/docker/master/build.sh b/src/main/resources/docker/master/build.sh
@@ -100,7 +100,7 @@ END_OF_USAGE
 trap  fatal  SIGINT  SIGTERM
 
 
-XWVERSION="12.2.4"
+XWVERSION="12.2.5"
 ROOTDIR="$(dirname "$0")"
 SCRIPTNAME="$(basename "$0")"
 

diff --git a/src/main/resources/docker/server/Dockerfile b/src/main/resources/docker/server/Dockerfile
@@ -37,7 +37,7 @@ LABEL "author"="Oleg Lodygensky"
 LABEL version="0.4"
 LABEL description="This creates a Docker image for the XWHEP server"
 EXPOSE 4321 4322 4323 443
-ENV XWVERSION "12.2.4"
+ENV XWVERSION "12.2.5"
 
 ADD . /xwhep
 WORKDIR /xwhep

diff --git a/src/main/resources/docker/worker/Dockerfile b/src/main/resources/docker/worker/Dockerfile
@@ -37,7 +37,7 @@ LABEL version="0.3"
 LABEL description="This creates a Docker image for the XWHEP worker"
 EXPOSE 4324 443
 
-ENV XWVERSION "12.2.4"
+ENV XWVERSION "12.2.5"
 
 
 #

diff --git a/src/main/resources/misc/dashboard.html b/src/main/resources/misc/dashboard.html
@@ -42,7 +42,7 @@
 
 
 
-<title>XtremWeb-HEP 12.2.4</title>
+<title>XtremWeb-HEP 12.2.5</title>
 
 
   <meta name="viewport" content="width=device-width, initial-scale=1">
@@ -72,7 +72,7 @@
 						class="icon-bar"></span>
 				</button>
 				<a class="navbar-brand" href="http://www.xtremweb-hep.org/">
-					XtremWeb-HEP 12.2.4
+					XtremWeb-HEP 12.2.5
 				</a>
 			</div>
 

diff --git a/src/main/resources/scripts/xwstartdocker.sh b/src/main/resources/scripts/xwstartdocker.sh
@@ -176,7 +176,7 @@ else
 fi
 
 
-IMAGENAME="xwimg_${XWJOBUID}"
+IMAGENAME=""
 CONTAINERNAME="xwcontainer_${XWJOBUID}"
 DOCKERFILENAME="Dockerfile"
 
@@ -193,11 +193,9 @@ while [ $# -gt 0 ]; do
       VERBOSE=1
       set -x
       ;;
-
-    -i | --img | --imgname )
-      shift
-      IMAGENAME="$1"
-      ;;
+  	* )
+  	  ARGS="$ARGS $1"
+  	  ;;
   esac
 
   shift
@@ -206,6 +204,7 @@ done
 
 
 if [ -f ${DOCKERFILENAME} ] ; then
+    IMAGENAME="xwimg_${XWJOBUID}"
     docker build --force-rm --tag ${IMAGENAME} .
 fi