move the release docker files to their own directories to help facilitate automated...

Signed-off-by: David K. Bainbridge <dbainbri@ciena.com>

diff --git a/packaging/docker/release/Dockerfile.base b/packaging/docker/release/base/Dockerfile
similarity index 91%
rename from packaging/docker/release/Dockerfile.base
rename to packaging/docker/release/base/Dockerfile
index 4f08187e1505c994e1fb0b505e1bc20dbdeef2da..52951cb4297816211caa198fdb07f43405844d4c 100644 (file)
--- a/packaging/docker/release/Dockerfile.base
+++ b/packaging/docker/release/base/Dockerfile
@@ -1,4 +1,5 @@
 FROM ubuntu:12.04
+MAINTAINER OpenDaylight Project <info@opendaylight.org>
 RUN echo "deb http://archive.ubuntu.com/ubuntu precise main universe" >> /etc/apt/sources.list
 RUN apt-get update && apt-get -y upgrade
 RUN apt-get -y install openjdk-7-jre-headless unzip wget
@@ -20,4 +21,4 @@ RUN rm -rf /opt/*.zip
 #    ODL Clustering        12001
 EXPOSE 1088 1830 2400 5666 6633 7800 8000 8080 8383 12001
 WORKDIR /opt/opendaylight
-ENTRYPOINT ["/opt/opendaylight/run.sh"]
\ No newline at end of file
+ENTRYPOINT ["/opt/opendaylight/run.sh"]

diff --git a/packaging/docker/release/Dockerfile.serviceprovider b/packaging/docker/release/serviceprovider/Dockerfile
similarity index 91%
rename from packaging/docker/release/Dockerfile.serviceprovider
rename to packaging/docker/release/serviceprovider/Dockerfile
index 88ae035235128af0101b5325347acaa4d29178e2..a5ccb256212f67678d5196e69a9f4862e290f045 100644 (file)
--- a/packaging/docker/release/Dockerfile.serviceprovider
+++ b/packaging/docker/release/serviceprovider/Dockerfile
@@ -1,4 +1,5 @@
 FROM ubuntu:12.04
+MAINTAINER OpenDaylight Project <info@opendaylight.org>
 RUN echo "deb http://archive.ubuntu.com/ubuntu precise main universe" >> /etc/apt/sources.list
 RUN apt-get update && apt-get -y upgrade
 RUN apt-get -y install openjdk-7-jre-headless unzip wget
@@ -20,4 +21,4 @@ RUN rm -rf /opt/*.zip
 #    ODL Clustering        12001
 EXPOSE 1088 1830 2400 4342 5666 6633 7800 8000 8080 8383 12001
 WORKDIR /opt/opendaylight
-ENTRYPOINT ["/opt/opendaylight/run.sh"]
\ No newline at end of file
+ENTRYPOINT ["/opt/opendaylight/run.sh"]

diff --git a/packaging/docker/release/Dockerfile.virtualization b/packaging/docker/release/virtualization/Dockerfile
similarity index 91%
rename from packaging/docker/release/Dockerfile.virtualization
rename to packaging/docker/release/virtualization/Dockerfile
index 309062128cd0375c3a21e471cfcbcb152c6d1e6a..0f58a4d893ec7e6e321231ba72ec1a7f6e39f635 100644 (file)
--- a/packaging/docker/release/Dockerfile.virtualization
+++ b/packaging/docker/release/virtualization/Dockerfile
@@ -1,4 +1,5 @@
 FROM ubuntu:12.04
+MAINTAINER OpenDaylight Project <info@opendaylight.org>
 RUN echo "deb http://archive.ubuntu.com/ubuntu precise main universe" >> /etc/apt/sources.list
 RUN apt-get update && apt-get -y upgrade
 RUN apt-get -y install openjdk-7-jre-headless unzip wget
@@ -20,4 +21,4 @@ RUN rm -rf /opt/*.zip
 #    ODL Clustering        12001
 EXPOSE 1088 1830 2400 5666 6633 7800 8000 8080 8383 12001
 WORKDIR /opt/opendaylight
-ENTRYPOINT ["/opt/opendaylight/run.sh"]
\ No newline at end of file
+ENTRYPOINT ["/opt/opendaylight/run.sh"]