diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-08-27 19:37:33 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-08-27 19:37:33 +0000 |
| commit | 61bd35098c017dadc208fb51afdfefd52be77082 (patch) | |
| tree | e6aad3c36e9d558f769b56d82537e82c6aba17a6 | |
| parent | 59dc528909411f1e1f5e4ae76a239eea62916d23 (diff) | |
| parent | b2c64529ed51c910f57636886b24dce25246cd88 (diff) | |
| download | kolla-61bd35098c017dadc208fb51afdfefd52be77082.tar.gz kolla-61bd35098c017dadc208fb51afdfefd52be77082.zip | |
Merge "Unify Centos and Ubuntu Source Install - Neutron"
| -rw-r--r-- | docker_templates/neutron/neutron-base/Dockerfile.j2 | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/docker_templates/neutron/neutron-base/Dockerfile.j2 b/docker_templates/neutron/neutron-base/Dockerfile.j2 index 367d5daae..3e10aff27 100644 --- a/docker_templates/neutron/neutron-base/Dockerfile.j2 +++ b/docker_templates/neutron/neutron-base/Dockerfile.j2 @@ -31,20 +31,16 @@ RUN apt-get install -y --no-install-recommends \ {% endif %} -ADD ./neutron.tar / -RUN ln -s /neutron-* /neutron - -RUN cd /neutron \ +ADD neutron.tar / +RUN ln -s /neutron-* neutron \ && useradd --user-group neutron \ - && pip install -r requirements.txt \ - && pip install --install-option="--install-scripts=/usr/bin" /neutron \ + && pip --no-cache-dir install /neutron \ && mkdir -p /etc/neutron /usr/share/neutron /var/log/neutron /home/neutron \ && cp -r etc/* /etc/neutron/ \ && cp -r etc/neutron/* /etc/neutron/ \ && cp etc/api-paste.ini /usr/share/neutron \ && mv /etc/neutron/neutron/ /etc/neutron/plugins/ \ - && chown -R neutron: /etc/neutron /var/log/neutron /home/neutron \ - && rm -rf /root/.cache + && chown -R neutron: /etc/neutron /usr/share/neutron /var/log/neutron /home/neutron {% endif %} |