From 3486d5bda33850fdc7d8c86896b1cc85e13caaaf Mon Sep 17 00:00:00 2001 From: liyingjun Date: Tue, 16 Aug 2016 23:18:12 +0800 Subject: [PATCH] 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 --- docker/magnum/magnum-conductor/Dockerfile.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/magnum/magnum-conductor/Dockerfile.j2 b/docker/magnum/magnum-conductor/Dockerfile.j2 index 84b15db18e..ab8657a8c3 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