diff options
| author | Sam Yaple <sam@yaple.net> | 2015-08-27 10:33:53 +0000 |
|---|---|---|
| committer | Sam Yaple <sam@yaple.net> | 2015-08-27 10:33:53 +0000 |
| commit | 97c18df507ec4333597c721eb8ea21d8a0197056 (patch) | |
| tree | 964694bb75fc036866faf564f2a86a28217cbf7e | |
| parent | eecf6581a47745d53298c4efa5af6c411afa6260 (diff) | |
| download | kolla-97c18df507ec4333597c721eb8ea21d8a0197056.tar.gz kolla-97c18df507ec4333597c721eb8ea21d8a0197056.zip | |
Unify Centos and Ubuntu Source Install - Ironic
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: I37132d763e4022ebd177a33696b08290cf20ad54
Partially-Implements: blueprint install-from-ubuntu
| -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 %} |