diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-09-04 06:24:28 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-09-04 06:24:28 +0000 |
| commit | 91bc4b094c79f75b8c9eb54769571f4f4c03cc11 (patch) | |
| tree | 39101fd0fb16fc07f9ae31a919eddec749aa78e7 /docker/ceilometer | |
| parent | d799f819d4e32fa19abbecb403cbb14a0631a1c1 (diff) | |
| parent | c22cf33268979db15f06f2bab347750127e5d7ee (diff) | |
| download | kolla-91bc4b094c79f75b8c9eb54769571f4f4c03cc11.tar.gz kolla-91bc4b094c79f75b8c9eb54769571f4f4c03cc11.zip | |
Merge "Allow arbitrary source archive name to be imported into Dockerfile"
Diffstat (limited to 'docker/ceilometer')
| -rw-r--r-- | docker/ceilometer/ceilometer-base/Dockerfile.j2 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docker/ceilometer/ceilometer-base/Dockerfile.j2 b/docker/ceilometer/ceilometer-base/Dockerfile.j2 index 376385169..8a469d43f 100644 --- a/docker/ceilometer/ceilometer-base/Dockerfile.j2 +++ b/docker/ceilometer/ceilometer-base/Dockerfile.j2 @@ -10,8 +10,8 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ {% endif %} {% elif install_type == 'source' %} -ADD ceilometer-base.tar / -RUN ln -s /ceilometer-* ceilometer \ +ADD ceilometer-base-archive /ceilometer-base-source +RUN ln -s ceilometer-base-source/* ceilometer \ && useradd --user-group ceilometer \ && pip --no-cache-dir install /ceilometer \ && mkdir -p /etc/ceilometer /var/log/ceilometer /home/ceilometer \ |