diff options
| author | Zuul <zuul@review.opendev.org> | 2026-04-27 10:14:02 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2026-04-27 10:14:02 +0000 |
| commit | cd7138495673e04e034334d00cd0886f16eba59c (patch) | |
| tree | ce41ea2e322e383c264aca42945c6e0141f3fd99 /docker/zun/zun-api | |
| parent | 8dc6bf38352f741fd92cf4c3bfe1adc2ae71ae60 (diff) | |
| parent | 77b92c33f979ad5ae4321a1b3604ce90a99415a1 (diff) | |
| download | kolla-cd7138495673e04e034334d00cd0886f16eba59c.tar.gz kolla-cd7138495673e04e034334d00cd0886f16eba59c.zip | |
Merge "Drop zun and kuryr"
Diffstat (limited to 'docker/zun/zun-api')
| -rw-r--r-- | docker/zun/zun-api/Dockerfile.j2 | 16 | ||||
| -rw-r--r-- | docker/zun/zun-api/extend_start.sh | 10 |
2 files changed, 0 insertions, 26 deletions
diff --git a/docker/zun/zun-api/Dockerfile.j2 b/docker/zun/zun-api/Dockerfile.j2 deleted file mode 100644 index ded752ae6..000000000 --- a/docker/zun/zun-api/Dockerfile.j2 +++ /dev/null @@ -1,16 +0,0 @@ -FROM {{ namespace }}/{{ image_prefix }}zun-base:{{ tag }} -{% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" -{% endblock %} - -{% block zun_api_header %}{% endblock %} - -{% import "macros.j2" as macros with context %} - -COPY extend_start.sh /usr/local/bin/kolla_zun_extend_start -RUN chmod 644 /usr/local/bin/kolla_zun_extend_start - -{{ macros.kolla_patch_sources() }} - -{% block zun_api_footer %}{% endblock %} -{% block footer %}{% endblock %} diff --git a/docker/zun/zun-api/extend_start.sh b/docker/zun/zun-api/extend_start.sh deleted file mode 100644 index f21cc1bd3..000000000 --- a/docker/zun/zun-api/extend_start.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/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 - zun-db-manage upgrade - exit 0 -fi - -. /usr/local/bin/kolla_httpd_setup |