diff options
| author | Sam Yaple <sam@yaple.net> | 2015-08-27 09:33:39 +0000 |
|---|---|---|
| committer | Sam Yaple <sam@yaple.net> | 2015-08-27 11:23:29 +0000 |
| commit | 42eebad553125f8fcb094989359f88367e32fe46 (patch) | |
| tree | b97143211c66b37c4f30a29150aa79a216b4b025 | |
| parent | eecf6581a47745d53298c4efa5af6c411afa6260 (diff) | |
| download | kolla-42eebad553125f8fcb094989359f88367e32fe46.tar.gz kolla-42eebad553125f8fcb094989359f88367e32fe46.zip | |
Unify Centos and Ubuntu Source Install - Keystone
A change merged in the base allows for Centos and Ubuntu to install
all python things to the same locations. This updates the source
section to reflect that change.
Change-Id: Ie3d0ce1bb72bad5b5eb6c0189fb6bcb757e6ed36
Partially-Implements: blueprint install-from-ubuntu
| -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 %} |