X-Git-Url: https://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=war%2Frun.sh;h=65e7a294a99e78456f69116f14a6468dcc64413d;hb=cc188058e4ca132b48f568b22d37cef8ebc9413e;hp=7da6bb58c612f3f83217b15355d44e791caea83c;hpb=4fa446ebc4f1ffd2229cfb1eaf04432cf257e8ac;p=pnews.git

diff --git a/war/run.sh b/war/run.sh
index 7da6bb5..65e7a29 100755
--- a/war/run.sh
+++ b/war/run.sh
@@ -2,12 +2,24 @@
 
 SDIR=`dirname $0`
 SWAR=`realpath $SDIR/target/pnews-1.0.war`
-TMP_DIR="/tmp/$$.tmp"
-DWAR="$TMP_DIR/config/dropins/pnews-1.0.war"
 
-mkdir -p $TMP_DIR/config/dropins
+if [ -z "$1" ]; then
+        exit 1
+else
+        SHARED_DIR="$1"
+fi
+
+mvn clean install
+
+echo "SHARED_DIR=$SHARED_DIR"
+
+SHARED_DIR=`realpath $SHARED_DIR`
+
+DWAR="$SHARED_DIR/apps/pnews-1.0.war"
+
+mkdir -p $SHARED_DIR/apps
 cp $SWAR $DWAR
-cp server.xml $TMP_DIR/config
+cp server.xml $SHARED_DIR
+cp server.env $SHARED_DIR
 
-#docker run -ti --name pnews -p 9080:9080 -p 9443:9443 -v $DWAR:/config/dropins/pnews.war websphere-liberty:webProfile7
-docker run -ti --name pnews -p 9080:9080 -p 9443:9443 -v $TMP_DIR/config:/config websphere-liberty:webProfile7
+docker run -ti --name pnews -p 9080:9080 -p 9443:9443 -v $SHARED_DIR:/opt/ibm/wlp/usr/servers/defaultServer websphere-liberty:webProfile7