diff options
| author | Swapnil Kulkarni (coolsvap) <me@coolsvap.net> | 2015-11-23 12:38:58 +0530 |
|---|---|---|
| committer | Swapnil Kulkarni (coolsvap) <me@coolsvap.net> | 2015-11-23 11:03:47 +0000 |
| commit | 59a1c8b9fb91c3f2510b41858431e9a8a935e830 (patch) | |
| tree | d81bbc8d887b2d32c3a81d498068d9ebfe55aa4c /docker/neutron | |
| parent | 4d69166e57b756f9dacdb33b304180de2ae333d5 (diff) | |
| download | kolla-59a1c8b9fb91c3f2510b41858431e9a8a935e830.tar.gz kolla-59a1c8b9fb91c3f2510b41858431e9a8a935e830.zip | |
Remove hardcoded MAINTAINER in Dockerfiles
Added new option in kolla-build.conf
Change-Id: I45fe51966bcb59ea19d112281ba3d5a1ba091a56
Closes-Bug:#1514304
Diffstat (limited to 'docker/neutron')
| -rw-r--r-- | docker/neutron/neutron-agents/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/neutron/neutron-base/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/neutron/neutron-linuxbridge-agent/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/neutron/neutron-openvswitch-agent/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/neutron/neutron-server/Dockerfile.j2 | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/docker/neutron/neutron-agents/Dockerfile.j2 b/docker/neutron/neutron-agents/Dockerfile.j2 index 159f39c5e..65ba46c8d 100644 --- a/docker/neutron/neutron-agents/Dockerfile.j2 +++ b/docker/neutron/neutron-agents/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}neutron-base:{{ tag }} -MAINTAINER Kolla Project (https://launchpad.net/kolla) +MAINTAINER {{ maintainer }} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} diff --git a/docker/neutron/neutron-base/Dockerfile.j2 b/docker/neutron/neutron-base/Dockerfile.j2 index 88d065b33..d0c02728a 100644 --- a/docker/neutron/neutron-base/Dockerfile.j2 +++ b/docker/neutron/neutron-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 == 'binary' %} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} diff --git a/docker/neutron/neutron-linuxbridge-agent/Dockerfile.j2 b/docker/neutron/neutron-linuxbridge-agent/Dockerfile.j2 index 8939d72fe..f38999659 100644 --- a/docker/neutron/neutron-linuxbridge-agent/Dockerfile.j2 +++ b/docker/neutron/neutron-linuxbridge-agent/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}neutron-base:{{ tag }} -MAINTAINER Kolla Project (https://launchpad.net/kolla) +MAINTAINER {{ maintainer }} {% if install_type == 'binary' %} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} diff --git a/docker/neutron/neutron-openvswitch-agent/Dockerfile.j2 b/docker/neutron/neutron-openvswitch-agent/Dockerfile.j2 index 39eaa889d..eaf446af6 100644 --- a/docker/neutron/neutron-openvswitch-agent/Dockerfile.j2 +++ b/docker/neutron/neutron-openvswitch-agent/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}neutron-base:{{ tag }} -MAINTAINER Kolla Project (https://launchpad.net/kolla) +MAINTAINER {{ maintainer }} {% if install_type == 'binary' %} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} diff --git a/docker/neutron/neutron-server/Dockerfile.j2 b/docker/neutron/neutron-server/Dockerfile.j2 index 1cb386d2f..a214701b5 100644 --- a/docker/neutron/neutron-server/Dockerfile.j2 +++ b/docker/neutron/neutron-server/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}neutron-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 |