diff options
| author | liyingjun <yingjun.li@kylin-cloud.com> | 2016-08-16 23:18:12 +0800 |
|---|---|---|
| committer | liyingjun <yingjun.li@kylin-cloud.com> | 2016-08-17 07:55:33 +0800 |
| commit | 3486d5bda33850fdc7d8c86896b1cc85e13caaaf (patch) | |
| tree | 05a9e6718b9626dc6c1192598986add051c3813c /docker/magnum | |
| parent | e3ca26f9e555e06e6588d7dca421a1d99563ee96 (diff) | |
| download | kolla-3486d5bda33850fdc7d8c86896b1cc85e13caaaf.tar.gz kolla-3486d5bda33850fdc7d8c86896b1cc85e13caaaf.zip | |
Fix tar command path for magnum conductor using ubuntu
In ubuntu, the tar binary path is /bin/tar instead of /usr/bin/tar.
Change to use tar directly for all os.
TrivialFix
Change-Id: I12562d3ac186acab651ffae715e5c7788cd98b7e
Diffstat (limited to 'docker/magnum')
| -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 |