summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-03-09 10:38:57 +0000
committerGerrit Code Review <review@openstack.org>2017-03-09 10:38:57 +0000
commit0a96afafda1cf06ddc7ed9c08efe158afb0c525d (patch)
treec6fe20c34cae4dcd59c1edba0ca9fa6b2df85b3c
parent4a6ffd6204d7d0e59239b17dfe37d99f27479227 (diff)
parentd1e5e64a354a7585fd0a5ab98be2fba7a5ab714e (diff)
Merge "Don't use --upgrade when installing into venv"
-rw-r--r--docker/keystone/Dockerfile.j22
1 files changed, 1 insertions, 1 deletions
diff --git a/docker/keystone/Dockerfile.j2 b/docker/keystone/Dockerfile.j2
index 4123b00..1b0a292 100644
--- a/docker/keystone/Dockerfile.j2
+++ b/docker/keystone/Dockerfile.j2
@@ -13,7 +13,7 @@ RUN apt-get install -y --no-install-recommends \
13{{ copy_sources("openstack/keystone", "/keystone") }} 13{{ copy_sources("openstack/keystone", "/keystone") }}
14 14
15RUN useradd --user-group keystone \ 15RUN useradd --user-group keystone \
16 && /var/lib/microservices/venv/bin/pip install --upgrade /keystone \ 16 && /var/lib/microservices/venv/bin/pip install /keystone \
17 && mkdir -p /etc/keystone/fernet-keys /etc/keystone/credential-keys /var/www/cgi-bin/keystone /var/log/apache2 /home/keystone \ 17 && mkdir -p /etc/keystone/fernet-keys /etc/keystone/credential-keys /var/www/cgi-bin/keystone /var/log/apache2 /home/keystone \
18 && cp -r /keystone/etc/* /etc/keystone/ \ 18 && cp -r /keystone/etc/* /etc/keystone/ \
19 && cp /var/lib/microservices/venv/bin/keystone-wsgi-admin /var/www/cgi-bin/keystone/admin \ 19 && cp /var/lib/microservices/venv/bin/keystone-wsgi-admin /var/www/cgi-bin/keystone/admin \