diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-09-14 05:16:11 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-09-14 05:16:11 +0000 |
| commit | ba32530faca434c0ef7ca3290b9bf17825342694 (patch) | |
| tree | 2c2342f3be779a26e93023c026d93cd5fb6445f3 /docker/ceph | |
| parent | ae9c246315d72f5acb724b9fa93886cc30b48cec (diff) | |
| parent | b41247c6569974d8b8591070076845e652d684ba (diff) | |
| download | kolla-ba32530faca434c0ef7ca3290b9bf17825342694.tar.gz kolla-ba32530faca434c0ef7ca3290b9bf17825342694.zip | |
Merge "Add header blocks to all Dockerfiles"
Diffstat (limited to 'docker/ceph')
| -rw-r--r-- | docker/ceph/ceph-base/Dockerfile.j2 | 3 | ||||
| -rw-r--r-- | docker/ceph/ceph-mon/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/ceph/ceph-osd/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/ceph/ceph-rgw/Dockerfile.j2 | 2 |
4 files changed, 9 insertions, 0 deletions
diff --git a/docker/ceph/ceph-base/Dockerfile.j2 b/docker/ceph/ceph-base/Dockerfile.j2 index aec79be74..19c9c6f80 100644 --- a/docker/ceph/ceph-base/Dockerfile.j2 +++ b/docker/ceph/ceph-base/Dockerfile.j2 @@ -1,5 +1,8 @@ FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} MAINTAINER {{ maintainer }} + +{% block ceph_base_header %}{% endblock %} + {% import "macros.j2" as macros with context %} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} diff --git a/docker/ceph/ceph-mon/Dockerfile.j2 b/docker/ceph/ceph-mon/Dockerfile.j2 index f0c084f6b..0627eff00 100644 --- a/docker/ceph/ceph-mon/Dockerfile.j2 +++ b/docker/ceph/ceph-mon/Dockerfile.j2 @@ -1,6 +1,8 @@ FROM {{ namespace }}/{{ image_prefix }}ceph-base:{{ tag }} MAINTAINER {{ maintainer }} +{% block ceph_mon_header %}{% endblock %} + COPY fetch_ceph_keys.py /usr/bin/ COPY extend_start.sh /usr/local/bin/kolla_extend_start diff --git a/docker/ceph/ceph-osd/Dockerfile.j2 b/docker/ceph/ceph-osd/Dockerfile.j2 index 41c0b6d20..3f38fd016 100644 --- a/docker/ceph/ceph-osd/Dockerfile.j2 +++ b/docker/ceph/ceph-osd/Dockerfile.j2 @@ -1,6 +1,8 @@ FROM {{ namespace }}/{{ image_prefix }}ceph-base:{{ tag }} MAINTAINER {{ maintainer }} +{% block ceph_osd_header %}{% endblock %} + COPY extend_start.sh /usr/local/bin/kolla_extend_start RUN chmod 755 /usr/local/bin/kolla_extend_start diff --git a/docker/ceph/ceph-rgw/Dockerfile.j2 b/docker/ceph/ceph-rgw/Dockerfile.j2 index ccdbdebf7..721bd8f05 100644 --- a/docker/ceph/ceph-rgw/Dockerfile.j2 +++ b/docker/ceph/ceph-rgw/Dockerfile.j2 @@ -1,6 +1,8 @@ FROM {{ namespace }}/{{ image_prefix }}ceph-base:{{ tag }} MAINTAINER {{ maintainer }} +{% block ceph_rgw_header %}{% endblock %} + {% block ceph_rgw_footer %}{% endblock %} {% block footer %}{% endblock %} {{ include_footer }} |