Merge pull request #17 from intracom-telecom-sdn/dockerfile-update

Dockerfile update
intracom-telecom-sdn · Feb 14, 2017 · e962b0a · e962b0a
2 parents 9f3de9b + 0c42a79
commit e962b0a
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/deploy/docker/no_proxy/Dockerfile b/deploy/docker/no_proxy/Dockerfile
@@ -36,7 +36,7 @@ RUN /bin/bash -c "/opt/provision_oftraf.sh"
 RUN wget -P /opt/ https://nexus.opendaylight.org/content/groups/public/org/opendaylight/integration/distribution-karaf/0.4.0-Beryllium/distribution-karaf-0.4.0-Beryllium.zip
 RUN wget -P /opt/ https://nexus.opendaylight.org/content/groups/public/org/opendaylight/integration/distribution-karaf/0.5.0-Boron/distribution-karaf-0.5.0-Boron.zip
 RUN wget -P /opt/ https://nexus.opendaylight.org/content/repositories/public/org/opendaylight/integration/distribution-karaf/0.4.3-Beryllium-SR3/distribution-karaf-0.4.3-Beryllium-SR3.zip
-
+RUN wget -P /opt/ https://nexus.opendaylight.org/content/groups/public/org/opendaylight/integration/distribution-karaf/0.5.2-Boron-SR2/distribution-karaf-0.5.2-Boron-SR2.zip
 
 # Configure ssh-server
 RUN mkdir /var/run/sshd

diff --git a/deploy/docker/proxy/Dockerfile b/deploy/docker/proxy/Dockerfile
@@ -32,7 +32,6 @@ RUN apt-get install --force-yes -y software-properties-common
 RUN add-apt-repository ppa:openjdk-r/ppa -y
 RUN apt-get update
 RUN apt-get install --force-yes -y openjdk-8-jdk
-#RUN update-alternatives --install /usr/bin/java java /usr/lib/jvm/java-8-openjdk-amd64/ 1100
 
 # ------------------------------------------------------------------------------
 # OFTRAF

diff --git a/docs/conf.py b/docs/conf.py
@@ -69,7 +69,7 @@
 # The short X.Y version.
 version = u'1.0'
 # The full version, including alpha/beta/rc tags.
-release = u'1.0.1'
+release = u'1.0.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.