diff options
| author | Zuul <zuul@review.opendev.org> | 2026-07-08 16:33:45 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2026-07-08 16:33:45 +0000 |
| commit | 44b4d81399792f539716618953f2cafa64086a5c (patch) | |
| tree | 4699d7e068e6dd842a9f1f247ca2f150d60d5e27 /docker/watcher/watcher-api | |
| parent | b3803eb9f951acd63018ab8ba69bcbd1a2de5c93 (diff) | |
| parent | db35ac8d793506bc43b62e7e39d27a75de1043ed (diff) | |
| download | kolla-44b4d81399792f539716618953f2cafa64086a5c.tar.gz kolla-44b4d81399792f539716618953f2cafa64086a5c.zip | |
Merge "Migrate to pyproject.toml"
Diffstat (limited to 'docker/watcher/watcher-api')
| -rw-r--r-- | docker/watcher/watcher-api/Dockerfile.j2 | 18 | ||||
| -rw-r--r-- | docker/watcher/watcher-api/extend_start.sh | 8 |
2 files changed, 0 insertions, 26 deletions
diff --git a/docker/watcher/watcher-api/Dockerfile.j2 b/docker/watcher/watcher-api/Dockerfile.j2 deleted file mode 100644 index f31b53ecf..000000000 --- a/docker/watcher/watcher-api/Dockerfile.j2 +++ /dev/null @@ -1,18 +0,0 @@ -FROM {{ namespace }}/{{ image_prefix }}watcher-base:{{ tag }} -{% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" -{% endblock %} - -{% block watcher_api_header %}{% endblock %} - -{% import "macros.j2" as macros with context %} - -COPY extend_start.sh /usr/local/bin/kolla_watcher_extend_start -RUN chmod 644 /usr/local/bin/kolla_watcher_extend_start - -{{ macros.kolla_patch_sources() }} - -{% block watcher_api_footer %}{% endblock %} -{% block footer %}{% endblock %} - -USER watcher diff --git a/docker/watcher/watcher-api/extend_start.sh b/docker/watcher/watcher-api/extend_start.sh deleted file mode 100644 index 629ea6355..000000000 --- a/docker/watcher/watcher-api/extend_start.sh +++ /dev/null @@ -1,8 +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 - watcher-db-manage --config-file /etc/watcher/watcher.conf upgrade - exit 0 -fi |