commit f87a5c85c18efea56e4ab96f376e7a33acd42bd7
author David K. Bainbridge <dbainbri@ciena.com> Fri Aug 11 11:04:57 2017 -0700
committer Sergio Slobodrian <sslobodr@ciena.com> Fri Aug 11 11:18:47 2017 -0700
tree e72b0a95e98198fa60bfefd6fd1925d506a0ef35
parent 686f7bd8a0f4fc315b17f070222a0f057e33858c

vol-374 correctly build docker images

Change-Id: I275ca749aa7173db83d3fb744234d21d18a4d234

docker/Dockerfile.onos

diff --git a/docker/Dockerfile.onos b/docker/Dockerfile.onos
index acaa845..60d40e3 100644
--- a/docker/Dockerfile.onos
+++ b/docker/Dockerfile.onos
@@ -49,7 +49,8 @@
 
 # Install the applications
 COPY config/app-install.sh .
-RUN chmod 755 ./app-install.sh && ./app-install.sh
+RUN chmod 755 ./app-install.sh
+RUN ./app-install.sh
 
 # Create the final image coping over the installed applications from the build stage
 FROM onosproject/onos:1.8

docker/config/app-install.sh

diff --git a/docker/config/app-install.sh b/docker/config/app-install.sh
index 0523886..4bb8808 100644
--- a/docker/config/app-install.sh
+++ b/docker/config/app-install.sh
@@ -1,11 +1,13 @@
 #!/bin/bash 
 
+HERE=$(pwd)
 for app in $APPS; do
+    cd $HERE
     echo "Installing application '$app'"
     oar=$(find $BUILD_ROOT -path "*/target/*" -name "$app*".oar)
     if [ "$oar x" == " x" ]; then
         echo "Required application, $app, not found."
-	continue
+	exit 1
     fi
     rm -rf $APP_INSTALL_ROOT
     mkdir -p $APP_INSTALL_ROOT