commit e763e356bf606f4b8cd882f910681271f6195b72
author Ray Milkey <ray@onlab.us> Tue Mar 21 10:52:32 2017 -0700
committer Ray Milkey <ray@onlab.us> Tue Mar 21 13:19:47 2017 -0700
tree 339cc783673a872759627bebb7319209532ec483
parent 12c08c07dbb6ca9f54a8be7f96ac2bd6d80c709d

Upgrades from 1.9 for docker image generation

Change-Id: I96039829f335428e528a82ac1a0e6c1569ce02cd

.dockerignore

diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 0000000..f78caff
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,17 @@
+**/*.class
+**/target
+**/*.iml
+**/*.pyc
+**/.idea
+.javacp*
+
+.buckd
+buck-out
+bucklets/plugins
+.git
+bin
+
+web/gui/src/main/webapp/tests/node_modules
+web/gui/src/test/_karma/node_modules
+web/gui/src/main/webapp/node_modules
+

Dockerfile

diff --git a/tools/build/docker/Dockerfile b/Dockerfile
similarity index 74%
rename from tools/build/docker/Dockerfile
rename to Dockerfile
index f273c14..acfa707 100644
--- a/tools/build/docker/Dockerfile
+++ b/Dockerfile
@@ -11,18 +11,16 @@
 # Set the environment variables
 ENV HOME /root
 ENV JAVA_HOME /usr/lib/jvm/java-8-oracle
-ENV ONOS_ROOT /src/onos
-ENV KARAF_VERSION 3.0.5
-ENV KARAF_ROOT /root/onos/apache-karaf-3.0.5
-ENV KARAF_LOG /root/onos/apache-karaf-3.0.5/data/log/karaf.log
 ENV BUILD_NUMBER docker
-ENV PATH $PATH:$KARAF_ROOT/bin
+ENV JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF8
 
-#Download and Build ONOS
+# Copy in the source
+COPY . /src/onos/
+
+# Build ONOS
 WORKDIR /src
-RUN     apt-get update && apt-get install -y python git less zip curl oracle-java8-installer oracle-java8-set-default && \
-        git clone https://github.com/opennetworkinglab/onos.git && \
-        cd onos && git checkout onos-1.8 && \
+RUN     apt-get update && apt-get install -y python less zip curl oracle-java8-installer oracle-java8-set-default && \
+        cd onos && \
         tools/build/onos-buck build onos && \
         cp buck-out/gen/tools/package/onos-package/onos.tar.gz /tmp/ && \
         cd .. && \
@@ -36,7 +34,7 @@
 # Change to /root directory
 WORKDIR /root
 
-#Install ONOS
+# Install ONOS
 RUN mkdir onos && \
    mv /tmp/onos.tar.gz . && \
    tar -xf onos.tar.gz -C onos --strip-components=1 && \
@@ -45,10 +43,11 @@
 
 # Ports
 # 6653 - OpenFlow
+# 6640 - OVSDB
 # 8181 - GUI
 # 8101 - ONOS CLI
 # 9876 - ONOS CLUSTER COMMUNICATION
-EXPOSE 6653 8181 8101 9876
+EXPOSE 6653 6640 8181 8101 9876
 
 # Get ready to run command
 WORKDIR /root/onos