diff options
| author | Sam Yaple <sam@yaple.net> | 2015-10-01 07:43:18 +0000 |
|---|---|---|
| committer | Sam Yaple <sam@yaple.net> | 2015-10-06 03:30:53 +0000 |
| commit | 94162bd08f40ec742a7bfcdcd4aac45be5bd5618 (patch) | |
| tree | 4a0027d671f3e14449663c29d6c95dc0dbe0cee0 /docker/haproxy/Dockerfile.j2 | |
| parent | cb4e875ae1e1ec2e6ddf8a6b37f42283697fd50c (diff) | |
| download | kolla-94162bd08f40ec742a7bfcdcd4aac45be5bd5618.tar.gz kolla-94162bd08f40ec742a7bfcdcd4aac45be5bd5618.zip | |
Bring Kolla inline with FHS
This brings Kolla images inline with FHS and should make finding
locations of things more consistent and reliable with the linux world
at large.
Change-Id: Iece5b4da4bace0fb8b1f41a65ab2c852ec73e6f8
Closes-Bug: #1485742
Diffstat (limited to 'docker/haproxy/Dockerfile.j2')
| -rw-r--r-- | docker/haproxy/Dockerfile.j2 | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/docker/haproxy/Dockerfile.j2 b/docker/haproxy/Dockerfile.j2 index e7a4abddd..4bd73b7e0 100644 --- a/docker/haproxy/Dockerfile.j2 +++ b/docker/haproxy/Dockerfile.j2 @@ -3,8 +3,7 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla) {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} -RUN yum -y install \ - haproxy \ +RUN yum -y install haproxy \ && yum clean all {% elif base_distro == 'ubuntu' %} @@ -19,9 +18,8 @@ RUN apt-get install -y --no-install-recommends haproxy \ {% endif %} -COPY ensure_latest_config.sh /opt/kolla/ - +COPY ensure_latest_config.sh /usr/local/bin/kolla_ensure_haproxy_latest_config COPY extend_start.sh /usr/local/bin/kolla_extend_start -RUN chmod 755 /usr/local/bin/kolla_extend_start /opt/kolla/ensure_latest_config.sh +RUN chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_ensure_haproxy_latest_config {{ include_footer }} |