summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-03-09 10:40:02 +0000
committerGerrit Code Review <review@openstack.org>2017-03-09 10:40:03 +0000
commit2230504d2ae24c7b38cbbfbc247a71832a6d2e92 (patch)
tree73254264fc8c09bcd0e1da0f86fb176d949280ce
parente5ed7fe74f9f2a45b1fb128c2f07b0988a371630 (diff)
parent4b615305f23b7c9d906430565a57213855deed68 (diff)
Merge "Don't use --upgrade when installing into venv"
-rw-r--r--docker/heat-base/Dockerfile.j22
1 files changed, 1 insertions, 1 deletions
diff --git a/docker/heat-base/Dockerfile.j2 b/docker/heat-base/Dockerfile.j2
index c3c0a16..62bdc6f 100644
--- a/docker/heat-base/Dockerfile.j2
+++ b/docker/heat-base/Dockerfile.j2
@@ -4,7 +4,7 @@ MAINTAINER {{ maintainer }}
4{{ copy_sources("openstack/heat", "/heat") }} 4{{ copy_sources("openstack/heat", "/heat") }}
5 5
6RUN useradd --user-group heat \ 6RUN useradd --user-group heat \
7 && /var/lib/microservices/venv/bin/pip install --upgrade /heat \ 7 && /var/lib/microservices/venv/bin/pip install /heat \
8 && mkdir -p /var/lib/heat /etc/heat \ 8 && mkdir -p /var/lib/heat /etc/heat \
9 && chown -R heat: /var/lib/heat /etc/heat \ 9 && chown -R heat: /var/lib/heat /etc/heat \
10 && cp -r /heat/etc/heat/* /etc/heat \ 10 && cp -r /heat/etc/heat/* /etc/heat \