X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=docker-build%2Fhelm-builder%2FDockerfile;h=93a4ef6e1386629282367e47e72fdddde453fea1;hb=3a4ce452b8f989641a25ec7b539a704168f51858;hp=7f1caaaa52395880f82140c77a37b8eaa05e146d;hpb=5c8e0ac9f56da49dffcd4f3200d54f615a395cce;p=ta%2Fcaas-helm.git

diff --git a/docker-build/helm-builder/Dockerfile b/docker-build/helm-builder/Dockerfile
index 7f1caaa..93a4ef6 100644
--- a/docker-build/helm-builder/Dockerfile
+++ b/docker-build/helm-builder/Dockerfile
@@ -12,7 +12,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM centos:7.6.1810
+FROM scratch
+ADD centos-7-docker.tar.xz /
+CMD ["/bin/bash"]
+
 MAINTAINER Krisztian Lengyel <krisztian.lengyel@nokia.com>
 
 ARG HELM_VERSION
@@ -28,17 +31,17 @@ ENV PATH="$GOPATH/bin:$go_install_dir/bin:$PATH"
 RUN yum install -y --setopt=skip_missing_names_on_install=False \
       ${build_packages} \
 &&  mkdir -p $go_install_dir \
-&&  curl -fsSL -k https://dl.google.com/go/go${go_version}.linux-amd64.tar.gz | tar zx --strip-components=1 -C ${go_install_dir} \
+&&  if [ $(uname -m) == 'aarch64' ]; then HOST_ARCH=arm64; else HOST_ARCH=amd64; fi \
+&&  curl -fsSL -k https://dl.google.com/go/go${go_version}.linux-${HOST_ARCH}.tar.gz | tar zx --strip-components=1 -C ${go_install_dir} \
 \
 # Build Helm
-&&  mkdir -p $GOPATH/src/k8s.io \
-&&  cd $GOPATH/src/k8s.io \
-&&  git clone https://github.com/kubernetes/helm.git \
-&&  cd helm \
+&&  mkdir -p $GOPATH/src/k8s.io/helm \
+&&  curl -fsSL -k https://github.com/helm/helm/archive/v${HELM_VERSION}.tar.gz | tar zx --strip-components=1 -C $GOPATH/src/k8s.io/helm \
+&&  cd $GOPATH/src/k8s.io/helm \
 &&  make GIT_TAG=v${HELM_VERSION} bootstrap build-cross \
 &&  mkdir -p ${binaries} \
-&&  mv ./_dist/linux-amd64/tiller ${binaries}/ \
-&&  mv ./_dist/linux-amd64/helm ${binaries}/ \
+&&  mv ./_dist/linux-${HOST_ARCH}/tiller ${binaries}/ \
+&&  mv ./_dist/linux-${HOST_ARCH}/helm ${binaries}/ \
 &&  rm -rf $GOPATH \
 &&  rm -rf $go_install_dir \
 &&  rm -rf /build \