diff options
| author | Vladislav Belogrudov <vladislav.belogrudov@oracle.com> | 2015-09-02 17:36:46 +0300 |
|---|---|---|
| committer | Vladislav Belogrudov <vladislav.belogrudov@oracle.com> | 2015-09-03 16:49:50 +0300 |
| commit | c22cf33268979db15f06f2bab347750127e5d7ee (patch) | |
| tree | d591aa2e08b0b0443f4e37264465293025552067 /docker/ironic | |
| parent | 233864ff32af10a2c927cdbca3475b537c8e6808 (diff) | |
| download | kolla-c22cf33268979db15f06f2bab347750127e5d7ee.tar.gz kolla-c22cf33268979db15f06f2bab347750127e5d7ee.zip | |
Allow arbitrary source archive name to be imported into Dockerfile
Currently we cannot import source archives with names different
than expected by hardcoded line in Dockerfiles. This worked well
for Openstack services' tarballs where we expected SERVICE-* root
folder after extraction or kanaka-noVNC for nova-novncproxy docker.
The latter fails if one tries to clone or get tarball under other
names. This fix allows any archive (tar,tgz,zip) or repo name to be
imported into dockerfile.
Change-Id: I869a6a19afaf0e93925572746c22b7589b6600c9
Closes-Bug: #1491415
Diffstat (limited to 'docker/ironic')
| -rw-r--r-- | docker/ironic/ironic-base/Dockerfile.j2 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docker/ironic/ironic-base/Dockerfile.j2 b/docker/ironic/ironic-base/Dockerfile.j2 index 4de31d2b7..c83cf2ee2 100644 --- a/docker/ironic/ironic-base/Dockerfile.j2 +++ b/docker/ironic/ironic-base/Dockerfile.j2 @@ -20,8 +20,8 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ {% endif %} {% elif install_type == 'source' %} -ADD ironic-base.tar / -RUN ln -s /ironic-* ironic \ +ADD ironic-base-archive /ironic-base-source +RUN ln -s ironic-base-source/* ironic \ && useradd --user-group ironic \ && pip --no-cache-dir install /ironic \ && mkdir -p /etc/ironic /var/log/ironic /home/ironic \ |