update for ONOS 1.10.3 support
Change-Id: I441d387d3e5d20058bdf2ef9050d7fe42cc43234
diff --git a/docker/Dockerfile.onos b/docker/Dockerfile.onos
index 18b2842..3a334d1 100644
--- a/docker/Dockerfile.onos
+++ b/docker/Dockerfile.onos
@@ -1,4 +1,4 @@
-FROM onosproject/onos:1.8 as build
+FROM onosproject/onos:1.10.3 as build
MAINTAINER Open Networking Foundation <info@opennetworking.org>
ENV BUILD_ROOT=/build
@@ -9,21 +9,21 @@
# must be replicated below to the final image as they are shared between stages
ENV ONOS=/root/onos
ENV APPS_ROOT=${ONOS}/apps
-ENV KARAF_VERSION=3.0.5
+ENV KARAF_VERSION=3.0.8
ENV KARAF_ROOT=${ONOS}/apache-karaf-${KARAF_VERSION}
ENV KARAF_M2=${KARAF_ROOT}/system
ENV APP_INSTALL_ROOT=/expand
# Specify application versions to install
-ENV AAA_VERSION=1.2.0-SNAPSHOT \
- CONFIG_VERSION=1.2.0-SNAPSHOT \
- IGMP_VERSION=1.2.0-SNAPSHOT \
- IGMP_PROXY_VERSION=1.0.0-SNAPSHOT \
- MCAST_VERSION=1.2.0-SNAPSHOT \
- OLT_VERSION=1.2.0-SNAPSHOT \
- SADIS_VERSION=1.0.0-SNAPSHOT \
- VTN_VERSION=1.2.0-SNAPSHOT \
- L2_DHCP_RELAY_VERSION=1.0.0-SNAPSHOT
+ENV AAA_VERSION=1.3.0-SNAPSHOT \
+ CONFIG_VERSION=1.3.0-SNAPSHOT \
+ IGMP_VERSION=1.3.0-SNAPSHOT \
+ IGMP_PROXY_VERSION=1.1.0-SNAPSHOT \
+ MCAST_VERSION=1.3.0-SNAPSHOT \
+ OLT_VERSION=1.3.0-SNAPSHOT \
+ SADIS_VERSION=1.1.0-SNAPSHOT \
+ VTN_VERSION=1.3.0-SNAPSHOT \
+ L2_DHCP_RELAY_VERSION=1.1.0-SNAPSHOT
ENV APPS="aaa-${AAA_VERSION} \
cord-config-${CONFIG_VERSION} \
@@ -42,10 +42,13 @@
RUN ./app-install.sh
# Create the final image coping over the installed applications from the build stage
-FROM onosproject/onos:1.8
+FROM onosproject/onos:1.10.3
+
+# 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}"
ENV ONOS=/root/onos
-ENV KARAF_VERSION=3.0.5
+ENV KARAF_VERSION=3.0.8
ENV KARAF_ROOT=${ONOS}/apache-karaf-${KARAF_VERSION}
ENV KARAF_M2=${KARAF_ROOT}/system
ENV APPS_ROOT=${ONOS}/apps
@@ -55,7 +58,12 @@
COPY --from=build ${APPS_ROOT}/ ${APPS_ROOT}/
COPY config/netcfg.json $KARAF_ROOT/../config/network-cfg.json
-RUN touch $ONOS/apps/org.onosproject.netcfghostprovider/active
-RUN touch $ONOS/apps/org.onosproject.netcfglinksprovider/active
+RUN touch $ONOS/apps/org.onosproject.hostprovider/active
RUN touch $ONOS/apps/org.onosproject.openflow-base/active
+RUN touch $ONOS/apps/org.onosproject.openflow-base/active
+
+# Create ONOS Key Directory
+RUN mkdir -p /home/sdn/wiki
+COPY docker/onos_cfg/ /home/sdn/wiki
+