diff options
| author | Zuul <zuul@review.openstack.org> | 2017-12-14 20:26:02 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-12-14 20:26:02 +0000 |
| commit | c27381e6fb970da299d99a6199c9c741530fd74c (patch) | |
| tree | 9fc747c7b1dae738daba3c875314d5a7496a13fc /docker | |
| parent | 9245418a240b8b65ebd994c6ff1494a9a397fc25 (diff) | |
| parent | cd679300a2b47547164ab9d63240c8b806d128e0 (diff) | |
| download | kolla-c27381e6fb970da299d99a6199c9c741530fd74c.tar.gz kolla-c27381e6fb970da299d99a6199c9c741530fd74c.zip | |
Merge "Remove the ceilometer api dockerfile"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/ceilometer/ceilometer-api/Dockerfile.j2 | 10 | ||||
| -rw-r--r-- | docker/ceilometer/ceilometer-notification/Dockerfile.j2 | 3 | ||||
| -rw-r--r-- | docker/ceilometer/ceilometer-notification/extend_start.sh (renamed from docker/ceilometer/ceilometer-api/extend_start.sh) | 0 |
3 files changed, 3 insertions, 10 deletions
diff --git a/docker/ceilometer/ceilometer-api/Dockerfile.j2 b/docker/ceilometer/ceilometer-api/Dockerfile.j2 deleted file mode 100644 index b53e5911e..000000000 --- a/docker/ceilometer/ceilometer-api/Dockerfile.j2 +++ /dev/null @@ -1,10 +0,0 @@ -FROM {{ namespace }}/{{ image_prefix }}ceilometer-base:{{ tag }} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" - -{% block ceilometer_api_header %}{% endblock %} - -COPY extend_start.sh /usr/local/bin/kolla_ceilometer_extend_start -RUN chmod 755 /usr/local/bin/kolla_ceilometer_extend_start - -{% block ceilometer_api_footer %}{% endblock %} -{% block footer %}{% endblock %} diff --git a/docker/ceilometer/ceilometer-notification/Dockerfile.j2 b/docker/ceilometer/ceilometer-notification/Dockerfile.j2 index 64e1c4b01..f6318104d 100644 --- a/docker/ceilometer/ceilometer-notification/Dockerfile.j2 +++ b/docker/ceilometer/ceilometer-notification/Dockerfile.j2 @@ -16,6 +16,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% endif %} +COPY extend_start.sh /usr/local/bin/kolla_ceilometer_extend_start +RUN chmod 755 /usr/local/bin/kolla_ceilometer_extend_start + {% block ceilometer_notification_footer %}{% endblock %} {% block footer %}{% endblock %} diff --git a/docker/ceilometer/ceilometer-api/extend_start.sh b/docker/ceilometer/ceilometer-notification/extend_start.sh index 281cce3fa..281cce3fa 100644 --- a/docker/ceilometer/ceilometer-api/extend_start.sh +++ b/docker/ceilometer/ceilometer-notification/extend_start.sh |