diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-08-27 16:39:05 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-08-27 16:39:05 +0000 |
| commit | 79773a3d6bcfbe83403fdfd46d14b14d902fe0c2 (patch) | |
| tree | 2728c35cfd94b397d0e7209d4c0d058de920d34a | |
| parent | 75fa5b0baf8fecdd93515f63300c75ee8e8e10a7 (diff) | |
| parent | 42eebad553125f8fcb094989359f88367e32fe46 (diff) | |
| download | kolla-79773a3d6bcfbe83403fdfd46d14b14d902fe0c2.tar.gz kolla-79773a3d6bcfbe83403fdfd46d14b14d902fe0c2.zip | |
Merge "Unify Centos and Ubuntu Source Install - Keystone"
| -rw-r--r-- | docker_templates/keystone/Dockerfile.j2 | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/docker_templates/keystone/Dockerfile.j2 b/docker_templates/keystone/Dockerfile.j2 index 142a52dd6..ec8144b91 100644 --- a/docker_templates/keystone/Dockerfile.j2 +++ b/docker_templates/keystone/Dockerfile.j2 @@ -48,17 +48,15 @@ RUN apt-get install -y --no-install-recommends \ {% endif %} -ADD ./keystone.tar / -RUN ln -s /keystone-* /keystone - -RUN cd /keystone \ +ADD keystone.tar / +RUN ln -s /keystone-* keystone \ && useradd --user-group keystone \ - && pip install -r requirements.txt \ - && pip install --install-option="--install-scripts=/usr/bin" /keystone \ + && pip --no-cache-dir install /keystone \ && mkdir -p /etc/keystone /var/www/cgi-bin/keystone /var/log/apache2 /home/keystone \ && cp -r /keystone/etc/* /etc/keystone/ \ - && cp -a httpd/keystone.py /var/www/cgi-bin/keystone/admin \ - && cp -a httpd/keystone.py /var/www/cgi-bin/keystone/main + && cp /keystone/httpd/keystone.py /var/www/cgi-bin/keystone/admin \ + && cp /keystone/httpd/keystone.py /var/www/cgi-bin/keystone/main \ + && chown -R keystone: /etc/keystone /var/www/cgi-bin/keystone /var/log/apache2 /home/keystone {% endif %} |