diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-12-08 15:50:31 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-12-08 15:50:31 +0000 |
| commit | 6a516dfd552bf459450c92fde4172a96e2bd6c42 (patch) | |
| tree | 8458bd82549f36bd555ff32656668ef6a3e8d562 | |
| parent | 37168c55a1ca3192ab26ad97b03f0e781e02c86b (diff) | |
| parent | 08e5a0128f8fb2dec59344a79a5c44ef7843e9b4 (diff) | |
| download | kolla-6a516dfd552bf459450c92fde4172a96e2bd6c42.tar.gz kolla-6a516dfd552bf459450c92fde4172a96e2bd6c42.zip | |
Merge "Fix panko dockerfile"
| -rw-r--r-- | docker/panko/panko-base/Dockerfile.j2 | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/docker/panko/panko-base/Dockerfile.j2 b/docker/panko/panko-base/Dockerfile.j2 index 98c95fc74..43f6ce7ce 100644 --- a/docker/panko/panko-base/Dockerfile.j2 +++ b/docker/panko/panko-base/Dockerfile.j2 @@ -46,12 +46,11 @@ RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf RUN truncate -s 0 /etc/apache2/ports.conf {% endif %} - ADD panko-base-archive /panko-base-source RUN ln -s panko-base-source/* panko \ && useradd --user-group panko \ - && /var/lib/kolla/venv/bin/pip --no-cache-dir install --upgrade -c requirements/upper-constraints.txt \ + && /var/lib/kolla/venv/bin/pip --no-cache-dir install --upgrade -c requirements/upper-constraints.txt /panko \ && mkdir -p /etc/panko /home/panko \ && cp -r /panko/etc/panko/* /etc/panko/ \ && chown -R panko: /etc/panko /home/panko |