Merge branch 'master' into ZNTA-1101-project-glossary

docker/rundev.sh

@@ -12,12 +12,20 @@ DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
 # change to top of the git working directory
 cd $DIR/../
 ZANATA_WAR=$(echo $PWD/zanata-war/target/zanata-*.war)
+
+if [ -f "$ZANATA_WAR" ]
+then
+    chcon -Rt svirt_sandbox_file_t "$ZANATA_WAR"
+else
+    echo "===== NO war file found. Please build Zanata war first ====="
+    exit 1
+fi
+
 # volume mapping for zanata server files
 ZANATA_DIR=$HOME/docker-volumes/zanata
 # create the data directory and set permissions (SELinux)
 mkdir -p $ZANATA_DIR && chcon -Rt svirt_sandbox_file_t "$ZANATA_DIR"
 # make zanata directory and standalone.xml file accessible to docker containers (SELinux)
-chcon -Rt svirt_sandbox_file_t "$ZANATA_WAR"
 
 # build the docker dev image
 docker build -t zanata/server-dev docker/