Build docker image from local source.
Currently we check out the code from gerrit to build the image, but this
makes it hard to specify a particular commit to build and impossible to
build a docker image from code that isn't yet checked in to git. This patch
will build the image from the local ONOS source.
Change-Id: I5936cb02d553aed3d9b6b5a260483759e36049c5
diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 0000000..12481bb
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,30 @@
+*~
+*.class
+.classpath
+.project
+.pydevproject
+.settings
+.javacp*
+.checkstyle
+target
+*.iml
+*.pyc
+dependency-reduced-pom.xml
+.idea
+*.DS_Store
+.buckd
+buck-out
+.buckconfig.local
+.buckjavaargs*
+bucklets/plugins/
+.watchmanconfig
+.git
+
+/bin/
+
+web/gui/src/main/webapp/tests/node_modules
+web/gui/src/test/_karma/node_modules
+web/gui/src/main/webapp/node_modules/
+
+npm-debug.log
+sonar-project.properties
diff --git a/tools/build/docker/Dockerfile b/tools/build/docker/Dockerfile
index 6bcae28..1269ef1 100644
--- a/tools/build/docker/Dockerfile
+++ b/tools/build/docker/Dockerfile
@@ -11,17 +11,13 @@
# 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
+
+COPY . /src/onos
#Download and 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 && \
+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/ && \