commit 28d60120fefedd4d730452a545d846b37bc426fd
author Andrea Campanella <andrea@opennetworking.org> Mon Oct 23 19:43:23 2017 +0200
committer Andrea Campanella <andrea@opennetworking.org> Mon Oct 23 10:49:41 2017 -0700
tree 443f783a968eaa31c754b81a2815a45b91183cfa
parent 10fe76e08749ebc7de3e5368aa24b1612e850a95

[CORD-2111] Updating ONOS to 1.10.8

Change-Id: Ib7b370fe8bd4fdb60a335546ec5e81af5ec47e45

docker/Dockerfile.onos

diff --git a/docker/Dockerfile.onos b/docker/Dockerfile.onos
index 7971625..acd06a8 100644
--- a/docker/Dockerfile.onos
+++ b/docker/Dockerfile.onos
@@ -1,4 +1,4 @@
-FROM onosproject/onos:1.10.6 as build
+FROM onosproject/onos:1.10.8 as build
 MAINTAINER Open Networking Foundation <info@opennetworking.org>
 
 ENV BUILD_ROOT=/build
@@ -42,7 +42,11 @@
 RUN ./app-install.sh
 
 # Create the final image coping over the installed applications from the build stage
+<<<<<<< HEAD
 FROM onosproject/onos:1.10.6
+=======
+FROM onosproject/onos:1.10.8
+>>>>>>> 61cc60f... [CORD-2111 Updating ONOS to 1.10.8]
 
 # Install Key Store Options
 ENV JAVA_OPTS="${JAVA_OPTS:--DenableOFTLS=true -Djavax.net.ssl.keyStore=/home/sdn/wiki/onos.jks -Djavax.net.ssl.keyStorePassword=222222 -Djavax.net.ssl.trustStore=/home/sdn/wiki/onos.jks -Djavax.net.ssl.trustStorePassword=222222}"