diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-11-23 14:12:33 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-11-23 14:12:33 +0000 |
| commit | 7f2d46278f2570fc18f5871ebc4f6433acec98a9 (patch) | |
| tree | 9ecea4d56d9a8fc4956cf947915f421f19d8a803 /docker/murano | |
| parent | c769ccffaec93929cd821f08d2de44674a5feb82 (diff) | |
| parent | 59a1c8b9fb91c3f2510b41858431e9a8a935e830 (diff) | |
| download | kolla-7f2d46278f2570fc18f5871ebc4f6433acec98a9.tar.gz kolla-7f2d46278f2570fc18f5871ebc4f6433acec98a9.zip | |
Merge "Remove hardcoded MAINTAINER in Dockerfiles"
Diffstat (limited to 'docker/murano')
| -rw-r--r-- | docker/murano/murano-api/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/murano/murano-base/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/murano/murano-engine/Dockerfile.j2 | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/docker/murano/murano-api/Dockerfile.j2 b/docker/murano/murano-api/Dockerfile.j2 index ea20a1f59..a64fec6b1 100644 --- a/docker/murano/murano-api/Dockerfile.j2 +++ b/docker/murano/murano-api/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}murano-base:{{ tag }} -MAINTAINER Kolla Project (https://launchpad.net/kolla) +MAINTAINER {{ maintainer }} COPY extend_start.sh /usr/local/bin/kolla_extend_start RUN chmod 755 /usr/local/bin/kolla_extend_start diff --git a/docker/murano/murano-base/Dockerfile.j2 b/docker/murano/murano-base/Dockerfile.j2 index 8fab1a4d4..cf45bfb37 100644 --- a/docker/murano/murano-base/Dockerfile.j2 +++ b/docker/murano/murano-base/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} -MAINTAINER Kolla Project (https://launchpad.net/kolla) +MAINTAINER {{ maintainer }} {% if install_type == 'source' %} diff --git a/docker/murano/murano-engine/Dockerfile.j2 b/docker/murano/murano-engine/Dockerfile.j2 index 8a1bd5db1..36d714e79 100644 --- a/docker/murano/murano-engine/Dockerfile.j2 +++ b/docker/murano/murano-engine/Dockerfile.j2 @@ -1,4 +1,4 @@ FROM {{ namespace }}/{{ image_prefix }}murano-base:{{ tag }} -MAINTAINER Kolla Project (https://launchpad.net/kolla) +MAINTAINER {{ maintainer }} {{ include_footer }} |