diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-08-27 16:36:37 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-08-27 16:36:37 +0000 |
| commit | 75fa5b0baf8fecdd93515f63300c75ee8e8e10a7 (patch) | |
| tree | 8973de6edc726d4e699807d74bac27c66d80fadb | |
| parent | ee84062af92829f6c4d9069a09714ac8e99f3229 (diff) | |
| parent | 97c18df507ec4333597c721eb8ea21d8a0197056 (diff) | |
| download | kolla-75fa5b0baf8fecdd93515f63300c75ee8e8e10a7.tar.gz kolla-75fa5b0baf8fecdd93515f63300c75ee8e8e10a7.zip | |
Merge "Unify Centos and Ubuntu Source Install - Ironic"
| -rw-r--r-- | docker_templates/ironic/ironic-base/Dockerfile.j2 | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/docker_templates/ironic/ironic-base/Dockerfile.j2 b/docker_templates/ironic/ironic-base/Dockerfile.j2 index 1e3361d47..0fc7e56c2 100644 --- a/docker_templates/ironic/ironic-base/Dockerfile.j2 +++ b/docker_templates/ironic/ironic-base/Dockerfile.j2 @@ -23,15 +23,11 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ {% elif install_type == 'source' %} ADD ironic.tar / -RUN ln -s /ironic-* /ironic - -RUN cd /ironic \ +RUN ln -s /ironic-* ironic \ && useradd --user-group ironic \ - && pip install -r requirements.txt \ - && pip install --install-option="--install-scripts=/usr/bin" /ironic \ + && pip --no-cache-dir install /ironic \ && mkdir -p /etc/ironic /var/log/ironic /home/ironic \ && cp -r /ironic/etc/* /etc/ironic/ \ - && chown -R ironic: /etc/ironic /var/log/ironic /home/ironic \ - && rm -rf /root/.cache + && chown -R ironic: /etc/ironic /var/log/ironic /home/ironic {% endif %} |