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/openvswitch | |
| parent | c769ccffaec93929cd821f08d2de44674a5feb82 (diff) | |
| parent | 59a1c8b9fb91c3f2510b41858431e9a8a935e830 (diff) | |
| download | kolla-7f2d46278f2570fc18f5871ebc4f6433acec98a9.tar.gz kolla-7f2d46278f2570fc18f5871ebc4f6433acec98a9.zip | |
Merge "Remove hardcoded MAINTAINER in Dockerfiles"
Diffstat (limited to 'docker/openvswitch')
| -rw-r--r-- | docker/openvswitch/openvswitch-base/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/openvswitch/openvswitch-db-server/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/openvswitch/openvswitch-vswitchd/Dockerfile.j2 | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/docker/openvswitch/openvswitch-base/Dockerfile.j2 b/docker/openvswitch/openvswitch-base/Dockerfile.j2 index 7ededdfcd..04b82fe50 100644 --- a/docker/openvswitch/openvswitch-base/Dockerfile.j2 +++ b/docker/openvswitch/openvswitch-base/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} -MAINTAINER Kolla Project (https://launchpad.net/kolla) +MAINTAINER {{ maintainer }} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} diff --git a/docker/openvswitch/openvswitch-db-server/Dockerfile.j2 b/docker/openvswitch/openvswitch-db-server/Dockerfile.j2 index 723c16071..8692f8cee 100644 --- a/docker/openvswitch/openvswitch-db-server/Dockerfile.j2 +++ b/docker/openvswitch/openvswitch-db-server/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}openvswitch-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/openvswitch/openvswitch-vswitchd/Dockerfile.j2 b/docker/openvswitch/openvswitch-vswitchd/Dockerfile.j2 index 23fc8bde5..43f3ca55e 100644 --- a/docker/openvswitch/openvswitch-vswitchd/Dockerfile.j2 +++ b/docker/openvswitch/openvswitch-vswitchd/Dockerfile.j2 @@ -1,5 +1,5 @@ FROM {{ namespace }}/{{ image_prefix }}openvswitch-base:{{ tag }} -MAINTAINER Kolla Project (https://launchpad.net/kolla) +MAINTAINER {{ maintainer }} COPY ovs_ensure_configured.sh /usr/local/bin/kolla_ensure_openvswitch_configured COPY extend_start.sh /usr/local/bin/kolla_extend_start |