diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-06-22 13:09:41 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-06-22 13:09:41 +0000 |
| commit | b7506b5c8eed689b3b26e90369367e6622352599 (patch) | |
| tree | cc13cab31b17a4743ce27e74bb064d4ee163e3cd /docker | |
| parent | b09f03a3403c130c12b051ca84c7e60192d42649 (diff) | |
| parent | 480c479ebf9520b4e8402cc23a20e0a0db707761 (diff) | |
| download | kolla-b7506b5c8eed689b3b26e90369367e6622352599.tar.gz kolla-b7506b5c8eed689b3b26e90369367e6622352599.zip | |
Merge "Add Kuryr Docker container"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/kuryr/Dockerfile.j2 | 19 | ||||
| -rw-r--r-- | docker/kuryr/extend_start.sh | 6 |
2 files changed, 25 insertions, 0 deletions
diff --git a/docker/kuryr/Dockerfile.j2 b/docker/kuryr/Dockerfile.j2 new file mode 100644 index 000000000..d0e094771 --- /dev/null +++ b/docker/kuryr/Dockerfile.j2 @@ -0,0 +1,19 @@ +FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} +MAINTAINER {{ maintainer }} + +{% if install_type == 'binary' %} + +RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ + && /bin/false + +{% elif install_type == 'source' %} + +ADD kuryr-archive /kuryr-source +RUN ln -s kuryr-source/* kuryr \ + && /var/lib/kolla/venv/bin/pip --no-cache-dir install --upgrade -c requirements/upper-constraints.txt /kuryr + +{% endif %} + +COPY extend_start.sh /usr/local/bin/kolla_extend_start + +{{ include_footer }} diff --git a/docker/kuryr/extend_start.sh b/docker/kuryr/extend_start.sh new file mode 100644 index 000000000..ee7045d04 --- /dev/null +++ b/docker/kuryr/extend_start.sh @@ -0,0 +1,6 @@ +#!/bin/bash + +if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then + mkdir -p /usr/lib/docker/plugins/kuryr + exit 0 +fi |