commit 77daee891b268bd92d52fc17df328e9c211d3c63
author Jonathan Hart <jono@onlab.us> Mon Jan 16 14:29:20 2017 -0800
committer Ali Al-Shabibi <ali@onlab.us> Tue Jan 17 15:29:59 2017 +0000
tree a549f141a438199426dd20fad92cb1b232d62827
parent 1af0ae530b7a9545b143e9d1af72aad77f3f88dc

Move Dockerfile to repository root.

It seems to be mandatory to have the Dockerfile here if we want to build
from the source in the repo in a Dockerhub automated build.

ONOS-5832

Change-Id: I01536ae9476987f20df03560834b1adcf0b6aec0

Dockerfile

diff --git a/tools/build/docker/Dockerfile b/Dockerfile
similarity index 94%
rename from tools/build/docker/Dockerfile
rename to Dockerfile
index 17f65ab..6ab7673 100644
--- a/tools/build/docker/Dockerfile
+++ b/Dockerfile
@@ -13,9 +13,10 @@
 ENV JAVA_HOME /usr/lib/jvm/java-8-oracle
 ENV BUILD_NUMBER docker
 
+# Copy in the source
 COPY . /src/onos/
 
-#Download and Build ONOS
+# Build ONOS
 WORKDIR /src
 RUN     apt-get update && apt-get install -y python less zip curl oracle-java8-installer oracle-java8-set-default && \
         cd onos && \
@@ -32,7 +33,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 && \
@@ -41,10 +42,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

tools/build/docker/Dockerfile.test

diff --git a/tools/build/docker/Dockerfile.test b/tools/build/docker/Dockerfile.test
deleted file mode 100644
index e6e343a..0000000
--- a/tools/build/docker/Dockerfile.test
+++ /dev/null
@@ -1,27 +0,0 @@
-FROM debian:jessie
-MAINTAINER Ali Al-Shabibi <ali@onlab.us>
-
-# Add Java 8 repository
-ENV DEBIAN_FRONTEND noninteractive
-RUN echo debconf shared/accepted-oracle-license-v1-1 select true | debconf-set-selections && \
-    echo "deb http://ppa.launchpad.net/webupd8team/java/ubuntu trusty main" | tee /etc/apt/sources.list.d/webupd8team-java.list && \
-    echo "deb-src http://ppa.launchpad.net/webupd8team/java/ubuntu trusty main" | tee -a /etc/apt/sources.list.d/webupd8team-java.list && \
-    apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys EEA14886
-
-# Set the environment variables
-ENV HOME /root
-ENV JAVA_HOME /usr/lib/jvm/java-8-oracle
-ENV BUILD_NUMBER docker
-
-COPY . /src/onos
-
-# Ports
-# 6653 - OpenFlow
-# 8181 - GUI
-# 8101 - ONOS CLI
-# 9876 - ONOS CLUSTER COMMUNICATION
-EXPOSE 6653 8181 8101 9876
-
-# Get ready to run command
-WORKDIR /root/onos
-ENTRYPOINT ["/bin/bash"]