diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-09-07 07:42:58 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-09-07 07:42:58 +0000 |
| commit | 5fca91c6fd45ff5807e1894598e6b97a00eef4bb (patch) | |
| tree | 1332ba9da5b22c258bd84aea577eb976fe1ce707 /docker/cloudkitty/cloudkitty-api | |
| parent | 00ffed38727b9f5b09562777d75f42e096f8bc36 (diff) | |
| parent | aa4b49a2c350a5d7ae48d3ef36bbc351abb624ae (diff) | |
| download | kolla-5fca91c6fd45ff5807e1894598e6b97a00eef4bb.tar.gz kolla-5fca91c6fd45ff5807e1894598e6b97a00eef4bb.zip | |
Merge "Add cloudkitty containers for type source"
Diffstat (limited to 'docker/cloudkitty/cloudkitty-api')
| -rw-r--r-- | docker/cloudkitty/cloudkitty-api/Dockerfile.j2 | 20 | ||||
| -rw-r--r-- | docker/cloudkitty/cloudkitty-api/extend_start.sh | 9 |
2 files changed, 29 insertions, 0 deletions
diff --git a/docker/cloudkitty/cloudkitty-api/Dockerfile.j2 b/docker/cloudkitty/cloudkitty-api/Dockerfile.j2 new file mode 100644 index 000000000..cdbff832d --- /dev/null +++ b/docker/cloudkitty/cloudkitty-api/Dockerfile.j2 @@ -0,0 +1,20 @@ +FROM {{ namespace }}/{{ image_prefix }}cloudkitty-base:{{ tag }} +MAINTAINER {{ maintainer }} + +{% import "macros.j2" as macros with context %} + +{% if install_type == 'binary' %} + +RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ + && /bin/false + +{% endif %} + +COPY extend_start.sh /usr/local/bin/kolla_cloudkitty_extend_start +RUN chmod 755 /usr/local/bin/kolla_cloudkitty_extend_start + +{% block cloudkitty_api_footer %}{% endblock %} +{% block footer %}{% endblock %} +{{ include_footer }} + +USER cloudkitty diff --git a/docker/cloudkitty/cloudkitty-api/extend_start.sh b/docker/cloudkitty/cloudkitty-api/extend_start.sh new file mode 100644 index 000000000..26d4a8c36 --- /dev/null +++ b/docker/cloudkitty/cloudkitty-api/extend_start.sh @@ -0,0 +1,9 @@ +#!/bin/bash + +# Bootstrap and exit if KOLLA_BOOTSTRAP variable is set. This catches all cases +# of the KOLLA_BOOTSTRAP variable being set, including empty. +if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then + cloudkitty-dbsync upgrade + cloudkitty-storage-init + exit 0 +fi |