From 1ef0e9f7db9ea074fb07e39b2c31185a132b4df8 Mon Sep 17 00:00:00 2001 From: Konstantinos Papadopoulos Date: Tue, 14 Feb 2017 09:34:09 +0200 Subject: [PATCH 1/2] Update on Dockerfiles --- deploy/docker/no_proxy/Dockerfile | 2 +- deploy/docker/proxy/Dockerfile | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/deploy/docker/no_proxy/Dockerfile b/deploy/docker/no_proxy/Dockerfile index 02f75c9..a885f3c 100755 --- 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 index 2d961e0..f05c8b5 100755 --- 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 From 0c42a79bd0e646964c4c8ee00c45e69803306166 Mon Sep 17 00:00:00 2001 From: Konstantinos Papadopoulos Date: Tue, 14 Feb 2017 09:36:11 +0200 Subject: [PATCH 2/2] Updates on conf.py --- docs/conf.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/conf.py b/docs/conf.py index 1a2ca23..b9baefe 100755 --- 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.