diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-08-18 03:07:51 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-08-18 03:07:51 +0000 |
| commit | 0f6f5228d0cc76085974f7e05f27aab7cdd8aa72 (patch) | |
| tree | 642dc43acc8900993b50f217f7388749bb6ba465 /docker | |
| parent | 08c7cc7b2d2e1d86cd6d9588114cea4f29e11a91 (diff) | |
| parent | 3486d5bda33850fdc7d8c86896b1cc85e13caaaf (diff) | |
| download | kolla-0f6f5228d0cc76085974f7e05f27aab7cdd8aa72.tar.gz kolla-0f6f5228d0cc76085974f7e05f27aab7cdd8aa72.zip | |
Merge "Fix tar command path for magnum conductor using ubuntu"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/magnum/magnum-conductor/Dockerfile.j2 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docker/magnum/magnum-conductor/Dockerfile.j2 b/docker/magnum/magnum-conductor/Dockerfile.j2 index 84b15db18..ab8657a8c 100644 --- a/docker/magnum/magnum-conductor/Dockerfile.j2 +++ b/docker/magnum/magnum-conductor/Dockerfile.j2 @@ -17,7 +17,7 @@ RUN {{ macros.install_packages(magnum_conductor_packages | customizable("package # Install kubectl binary (ugh) RUN cd /tmp \ && curl -L https://github.com/GoogleCloudPlatform/kubernetes/releases/download/v0.15.0/kubernetes.tar.gz -o /tmp/kubernetes.tar.gz \ - && /usr/bin/tar -xzvf /tmp/kubernetes.tar.gz \ + && tar -xzvf /tmp/kubernetes.tar.gz \ && cp -a /tmp/kubernetes/platforms/linux/amd64/kubectl /usr/bin/kubectl \ && rm -rf /tmp/kubernetes |