aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-07-25 19:53:10 +0000
committerGerrit Code Review <review@openstack.org>2015-07-25 19:53:10 +0000
commit3e8d69e09c7a7b19a4545103b1f6d0135b7332e7 (patch)
treeb57f6f8d248676a805fbea7a5e891d37745643aa
parent45546c249385bc95cba4180bb2fb83a7b20c02d5 (diff)
parent8d2084e1afe7000a56d7ba7fd2451ac67fc1f76c (diff)
downloadkolla-3e8d69e09c7a7b19a4545103b1f6d0135b7332e7.tar.gz
kolla-3e8d69e09c7a7b19a4545103b1f6d0135b7332e7.zip
Merge "Add build from source for Designate"
-rw-r--r--docker/centos/source/designate/designate-api/Dockerfile7
l---------docker/centos/source/designate/designate-api/build1
l---------docker/centos/source/designate/designate-api/config-external.sh1
l---------docker/centos/source/designate/designate-api/config-internal.sh1
l---------docker/centos/source/designate/designate-api/start.sh1
-rw-r--r--docker/centos/source/designate/designate-backend-bind9-data/Dockerfile6
l---------docker/centos/source/designate/designate-backend-bind9-data/build1
-rw-r--r--docker/centos/source/designate/designate-backend-bind9/Dockerfile7
l---------docker/centos/source/designate/designate-backend-bind9/build1
l---------docker/centos/source/designate/designate-backend-bind9/config-external.sh1
l---------docker/centos/source/designate/designate-backend-bind9/config-internal.sh1
l---------docker/centos/source/designate/designate-backend-bind9/start.sh1
-rw-r--r--docker/centos/source/designate/designate-base/.buildinfo11
-rw-r--r--docker/centos/source/designate/designate-base/Dockerfile17
l---------docker/centos/source/designate/designate-base/build1
l---------docker/centos/source/designate/designate-base/config-designate.sh1
-rw-r--r--docker/centos/source/designate/designate-central/Dockerfile7
l---------docker/centos/source/designate/designate-central/build1
l---------docker/centos/source/designate/designate-central/config-external.sh1
l---------docker/centos/source/designate/designate-central/config-internal.sh1
l---------docker/centos/source/designate/designate-central/start.sh1
-rw-r--r--docker/centos/source/designate/designate-mdns/Dockerfile7
l---------docker/centos/source/designate/designate-mdns/build1
l---------docker/centos/source/designate/designate-mdns/config-external.sh1
l---------docker/centos/source/designate/designate-mdns/config-internal.sh1
l---------docker/centos/source/designate/designate-mdns/start.sh1
-rw-r--r--docker/centos/source/designate/designate-poolmanager/Dockerfile7
l---------docker/centos/source/designate/designate-poolmanager/build1
l---------docker/centos/source/designate/designate-poolmanager/config-external.sh1
l---------docker/centos/source/designate/designate-poolmanager/config-internal.sh1
l---------docker/centos/source/designate/designate-poolmanager/start.sh1
-rw-r--r--docker/centos/source/designate/designate-sink/Dockerfile7
l---------docker/centos/source/designate/designate-sink/build1
l---------docker/centos/source/designate/designate-sink/config-external.sh1
l---------docker/centos/source/designate/designate-sink/config-internal.sh1
l---------docker/centos/source/designate/designate-sink/start.sh1
36 files changed, 103 insertions, 0 deletions
diff --git a/docker/centos/source/designate/designate-api/Dockerfile b/docker/centos/source/designate/designate-api/Dockerfile
new file mode 100644
index 000000000..ab724493f
--- /dev/null
+++ b/docker/centos/source/designate/designate-api/Dockerfile
@@ -0,0 +1,7 @@
+FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%designate-base:%%KOLLA_TAG%%
+MAINTAINER Kolla Project (https://launchpad.net/kolla)
+
+COPY start.sh /start.sh
+COPY config-internal.sh config-external.sh /opt/kolla/
+
+CMD ["/start.sh"]
diff --git a/docker/centos/source/designate/designate-api/build b/docker/centos/source/designate/designate-api/build
new file mode 120000
index 000000000..ec1913803
--- /dev/null
+++ b/docker/centos/source/designate/designate-api/build
@@ -0,0 +1 @@
+../../../../../tools/build-docker-image \ No newline at end of file
diff --git a/docker/centos/source/designate/designate-api/config-external.sh b/docker/centos/source/designate/designate-api/config-external.sh
new file mode 120000
index 000000000..da641a600
--- /dev/null
+++ b/docker/centos/source/designate/designate-api/config-external.sh
@@ -0,0 +1 @@
+../../../../common/designate/designate-api/config-external.sh \ No newline at end of file
diff --git a/docker/centos/source/designate/designate-api/config-internal.sh b/docker/centos/source/designate/designate-api/config-internal.sh
new file mode 120000
index 000000000..438a6fd75
--- /dev/null
+++ b/docker/centos/source/designate/designate-api/config-internal.sh
@@ -0,0 +1 @@
+../../../../common/designate/designate-api/config-internal.sh \ No newline at end of file
diff --git a/docker/centos/source/designate/designate-api/start.sh b/docker/centos/source/designate/designate-api/start.sh
new file mode 120000
index 000000000..f96fe1a34
--- /dev/null
+++ b/docker/centos/source/designate/designate-api/start.sh
@@ -0,0 +1 @@
+../../../../common/designate/designate-api/start.sh \ No newline at end of file
diff --git a/docker/centos/source/designate/designate-backend-bind9-data/Dockerfile b/docker/centos/source/designate/designate-backend-bind9-data/Dockerfile
new file mode 100644
index 000000000..99909c361
--- /dev/null
+++ b/docker/centos/source/designate/designate-backend-bind9-data/Dockerfile
@@ -0,0 +1,6 @@
+FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%%
+MAINTAINER Kolla Project (https://launchpad.net/kolla)
+
+VOLUME [ "/var/named" ]
+
+CMD [ "/bin/true" ]
diff --git a/docker/centos/source/designate/designate-backend-bind9-data/build b/docker/centos/source/designate/designate-backend-bind9-data/build
new file mode 120000
index 000000000..ec1913803
--- /dev/null
+++ b/docker/centos/source/designate/designate-backend-bind9-data/build
@@ -0,0 +1 @@
+../../../../../tools/build-docker-image \ No newline at end of file
diff --git a/docker/centos/source/designate/designate-backend-bind9/Dockerfile b/docker/centos/source/designate/designate-backend-bind9/Dockerfile
new file mode 100644
index 000000000..ab724493f
--- /dev/null
+++ b/docker/centos/source/designate/designate-backend-bind9/Dockerfile
@@ -0,0 +1,7 @@
+FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%designate-base:%%KOLLA_TAG%%
+MAINTAINER Kolla Project (https://launchpad.net/kolla)
+
+COPY start.sh /start.sh
+COPY config-internal.sh config-external.sh /opt/kolla/
+
+CMD ["/start.sh"]
diff --git a/docker/centos/source/designate/designate-backend-bind9/build b/docker/centos/source/designate/designate-backend-bind9/build
new file mode 120000
index 000000000..ec1913803
--- /dev/null
+++ b/docker/centos/source/designate/designate-backend-bind9/build
@@ -0,0 +1 @@
+../../../../../tools/build-docker-image \ No newline at end of file
diff --git a/docker/centos/source/designate/designate-backend-bind9/config-external.sh b/docker/centos/source/designate/designate-backend-bind9/config-external.sh
new file mode 120000
index 000000000..98eabc775
--- /dev/null
+++ b/docker/centos/source/designate/designate-backend-bind9/config-external.sh
@@ -0,0 +1 @@
+../../../../common/designate/designate-backend-bind9/config-external.sh \ No newline at end of file
diff --git a/docker/centos/source/designate/designate-backend-bind9/config-internal.sh b/docker/centos/source/designate/designate-backend-bind9/config-internal.sh
new file mode 120000
index 000000000..7d7c0d0e4
--- /dev/null
+++ b/docker/centos/source/designate/designate-backend-bind9/config-internal.sh
@@ -0,0 +1 @@
+../../../../common/designate/designate-backend-bind9/config-internal.sh \ No newline at end of file
diff --git a/docker/centos/source/designate/designate-backend-bind9/start.sh b/docker/centos/source/designate/designate-backend-bind9/start.sh
new file mode 120000
index 000000000..918411fa1
--- /dev/null
+++ b/docker/centos/source/designate/designate-backend-bind9/start.sh
@@ -0,0 +1 @@
+../../../../common/designate/designate-backend-bind9/start.sh \ No newline at end of file
diff --git a/docker/centos/source/designate/designate-base/.buildinfo b/docker/centos/source/designate/designate-base/.buildinfo
new file mode 100644
index 000000000..de3736376
--- /dev/null
+++ b/docker/centos/source/designate/designate-base/.buildinfo
@@ -0,0 +1,11 @@
+# Build info specific to this image. All values can be overridden in .buildconf
+
+COMPONENT=designate
+SOURCE_INSTALL_AVAILABLE=1
+
+# Used for git install method
+: ${CLONE_FROM:=https://github.com/openstack/designate}
+
+# Used for curl install method
+: ${TARBALL_URI:=http://tarballs.openstack.org/designate/designate-master.tar.gz}
+
diff --git a/docker/centos/source/designate/designate-base/Dockerfile b/docker/centos/source/designate/designate-base/Dockerfile
new file mode 100644
index 000000000..97c1ef941
--- /dev/null
+++ b/docker/centos/source/designate/designate-base/Dockerfile
@@ -0,0 +1,17 @@
+FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%%
+MAINTAINER Kolla Project (https://launchpad.net/kolla)
+
+ADD ./designate.tar /
+RUN ln -s /designate-* /designate
+
+RUN cd /designate \
+ && useradd --user-group designate \
+ && pip install -r requirements.txt \
+ && pip install /designate \
+ && mkdir /etc/designate /var/log/designate \
+ && cp -r /designate/etc/* /etc/designate/ \
+ && rm -rf /root/.cache
+
+COPY config-designate.sh /opt/kolla/
+
+CMD ["/start.sh"]
diff --git a/docker/centos/source/designate/designate-base/build b/docker/centos/source/designate/designate-base/build
new file mode 120000
index 000000000..ec1913803
--- /dev/null
+++ b/docker/centos/source/designate/designate-base/build
@@ -0,0 +1 @@
+../../../../../tools/build-docker-image \ No newline at end of file
diff --git a/docker/centos/source/designate/designate-base/config-designate.sh b/docker/centos/source/designate/designate-base/config-designate.sh
new file mode 120000
index 000000000..77aa738de
--- /dev/null
+++ b/docker/centos/source/designate/designate-base/config-designate.sh
@@ -0,0 +1 @@
+../../../../common/designate/designate-base/config-designate.sh \ No newline at end of file
diff --git a/docker/centos/source/designate/designate-central/Dockerfile b/docker/centos/source/designate/designate-central/Dockerfile
new file mode 100644
index 000000000..ab724493f
--- /dev/null
+++ b/docker/centos/source/designate/designate-central/Dockerfile
@@ -0,0 +1,7 @@
+FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%designate-base:%%KOLLA_TAG%%
+MAINTAINER Kolla Project (https://launchpad.net/kolla)
+
+COPY start.sh /start.sh
+COPY config-internal.sh config-external.sh /opt/kolla/
+
+CMD ["/start.sh"]
diff --git a/docker/centos/source/designate/designate-central/build b/docker/centos/source/designate/designate-central/build
new file mode 120000
index 000000000..ec1913803
--- /dev/null
+++ b/docker/centos/source/designate/designate-central/build
@@ -0,0 +1 @@
+../../../../../tools/build-docker-image \ No newline at end of file
diff --git a/docker/centos/source/designate/designate-central/config-external.sh b/docker/centos/source/designate/designate-central/config-external.sh
new file mode 120000
index 000000000..abe5bcd39
--- /dev/null
+++ b/docker/centos/source/designate/designate-central/config-external.sh
@@ -0,0 +1 @@
+../../../../common/designate/designate-central/config-external.sh \ No newline at end of file
diff --git a/docker/centos/source/designate/designate-central/config-internal.sh b/docker/centos/source/designate/designate-central/config-internal.sh
new file mode 120000
index 000000000..94fcafd40
--- /dev/null
+++ b/docker/centos/source/designate/designate-central/config-internal.sh
@@ -0,0 +1 @@
+../../../../common/designate/designate-central/config-internal.sh \ No newline at end of file
diff --git a/docker/centos/source/designate/designate-central/start.sh b/docker/centos/source/designate/designate-central/start.sh
new file mode 120000
index 000000000..9e0a8c484
--- /dev/null
+++ b/docker/centos/source/designate/designate-central/start.sh
@@ -0,0 +1 @@
+../../../../common/designate/designate-central/start.sh \ No newline at end of file
diff --git a/docker/centos/source/designate/designate-mdns/Dockerfile b/docker/centos/source/designate/designate-mdns/Dockerfile
new file mode 100644
index 000000000..ab724493f
--- /dev/null
+++ b/docker/centos/source/designate/designate-mdns/Dockerfile
@@ -0,0 +1,7 @@
+FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%designate-base:%%KOLLA_TAG%%
+MAINTAINER Kolla Project (https://launchpad.net/kolla)
+
+COPY start.sh /start.sh
+COPY config-internal.sh config-external.sh /opt/kolla/
+
+CMD ["/start.sh"]
diff --git a/docker/centos/source/designate/designate-mdns/build b/docker/centos/source/designate/designate-mdns/build
new file mode 120000
index 000000000..ec1913803
--- /dev/null
+++ b/docker/centos/source/designate/designate-mdns/build
@@ -0,0 +1 @@
+../../../../../tools/build-docker-image \ No newline at end of file
diff --git a/docker/centos/source/designate/designate-mdns/config-external.sh b/docker/centos/source/designate/designate-mdns/config-external.sh
new file mode 120000
index 000000000..e450238fc
--- /dev/null
+++ b/docker/centos/source/designate/designate-mdns/config-external.sh
@@ -0,0 +1 @@
+../../../../common/designate/designate-mdns/config-external.sh \ No newline at end of file
diff --git a/docker/centos/source/designate/designate-mdns/config-internal.sh b/docker/centos/source/designate/designate-mdns/config-internal.sh
new file mode 120000
index 000000000..c838250c9
--- /dev/null
+++ b/docker/centos/source/designate/designate-mdns/config-internal.sh
@@ -0,0 +1 @@
+../../../../common/designate/designate-mdns/config-internal.sh \ No newline at end of file
diff --git a/docker/centos/source/designate/designate-mdns/start.sh b/docker/centos/source/designate/designate-mdns/start.sh
new file mode 120000
index 000000000..f7bf747fc
--- /dev/null
+++ b/docker/centos/source/designate/designate-mdns/start.sh
@@ -0,0 +1 @@
+../../../../common/designate/designate-mdns/start.sh \ No newline at end of file
diff --git a/docker/centos/source/designate/designate-poolmanager/Dockerfile b/docker/centos/source/designate/designate-poolmanager/Dockerfile
new file mode 100644
index 000000000..ab724493f
--- /dev/null
+++ b/docker/centos/source/designate/designate-poolmanager/Dockerfile
@@ -0,0 +1,7 @@
+FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%designate-base:%%KOLLA_TAG%%
+MAINTAINER Kolla Project (https://launchpad.net/kolla)
+
+COPY start.sh /start.sh
+COPY config-internal.sh config-external.sh /opt/kolla/
+
+CMD ["/start.sh"]
diff --git a/docker/centos/source/designate/designate-poolmanager/build b/docker/centos/source/designate/designate-poolmanager/build
new file mode 120000
index 000000000..ec1913803
--- /dev/null
+++ b/docker/centos/source/designate/designate-poolmanager/build
@@ -0,0 +1 @@
+../../../../../tools/build-docker-image \ No newline at end of file
diff --git a/docker/centos/source/designate/designate-poolmanager/config-external.sh b/docker/centos/source/designate/designate-poolmanager/config-external.sh
new file mode 120000
index 000000000..461acb12a
--- /dev/null
+++ b/docker/centos/source/designate/designate-poolmanager/config-external.sh
@@ -0,0 +1 @@
+../../../../common/designate/designate-poolmanager/config-external.sh \ No newline at end of file
diff --git a/docker/centos/source/designate/designate-poolmanager/config-internal.sh b/docker/centos/source/designate/designate-poolmanager/config-internal.sh
new file mode 120000
index 000000000..6b43b0ddd
--- /dev/null
+++ b/docker/centos/source/designate/designate-poolmanager/config-internal.sh
@@ -0,0 +1 @@
+../../../../common/designate/designate-poolmanager/config-internal.sh \ No newline at end of file
diff --git a/docker/centos/source/designate/designate-poolmanager/start.sh b/docker/centos/source/designate/designate-poolmanager/start.sh
new file mode 120000
index 000000000..cc428b4fe
--- /dev/null
+++ b/docker/centos/source/designate/designate-poolmanager/start.sh
@@ -0,0 +1 @@
+../../../../common/designate/designate-poolmanager/start.sh \ No newline at end of file
diff --git a/docker/centos/source/designate/designate-sink/Dockerfile b/docker/centos/source/designate/designate-sink/Dockerfile
new file mode 100644
index 000000000..ab724493f
--- /dev/null
+++ b/docker/centos/source/designate/designate-sink/Dockerfile
@@ -0,0 +1,7 @@
+FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%designate-base:%%KOLLA_TAG%%
+MAINTAINER Kolla Project (https://launchpad.net/kolla)
+
+COPY start.sh /start.sh
+COPY config-internal.sh config-external.sh /opt/kolla/
+
+CMD ["/start.sh"]
diff --git a/docker/centos/source/designate/designate-sink/build b/docker/centos/source/designate/designate-sink/build
new file mode 120000
index 000000000..ec1913803
--- /dev/null
+++ b/docker/centos/source/designate/designate-sink/build
@@ -0,0 +1 @@
+../../../../../tools/build-docker-image \ No newline at end of file
diff --git a/docker/centos/source/designate/designate-sink/config-external.sh b/docker/centos/source/designate/designate-sink/config-external.sh
new file mode 120000
index 000000000..edc94e6e4
--- /dev/null
+++ b/docker/centos/source/designate/designate-sink/config-external.sh
@@ -0,0 +1 @@
+../../../../common/designate/designate-sink/config-external.sh \ No newline at end of file
diff --git a/docker/centos/source/designate/designate-sink/config-internal.sh b/docker/centos/source/designate/designate-sink/config-internal.sh
new file mode 120000
index 000000000..713fc1b22
--- /dev/null
+++ b/docker/centos/source/designate/designate-sink/config-internal.sh
@@ -0,0 +1 @@
+../../../../common/designate/designate-sink/config-internal.sh \ No newline at end of file
diff --git a/docker/centos/source/designate/designate-sink/start.sh b/docker/centos/source/designate/designate-sink/start.sh
new file mode 120000
index 000000000..751b58345
--- /dev/null
+++ b/docker/centos/source/designate/designate-sink/start.sh
@@ -0,0 +1 @@
+../../../../common/designate/designate-sink/start.sh \ No newline at end of file