update binary ks

Signed-off-by: stoneshi-yunify <[email protected]>

Author: stoneshi-yunify

base/Dockerfile

@@ -1,58 +1,7 @@
-FROM centos:7
+FROM kubespheredev/builder-base:v3.2.2
 
-# utils
-RUN yum install -y epel-release ca-certificates && \
-  yum install -y unzip \
-  which \
-  make \
-  wget \
-  zip \
-  bzip2 \
-  gcc \
-  gcc-c++ \
-  curl-devel \
-  autoconf \
-  expat-devel \
-  gettext-devel \
-  openssl-devel \
-  perl-devel \
-  zlib-devel \
-  python-pip \
-  java-1.8.0-openjdk && \
-  yum -y clean all --enablerepo='*'
-
-RUN wget https://mirrors.edge.kernel.org/pub/software/scm/git/git-2.9.5.tar.gz && \
-    tar zxvf git-2.9.5.tar.gz --no-same-owner && \
-    cd git-2.9.5 && \
-    make configure && \
-    ./configure prefix=/usr/local/git/ && \
-    make && \
-    make install && \
-    mv /usr/local/git/bin/git /usr/bin/ && \
-    cd ..&& \
-    rm -rf git-2.9.5.tar.gz git-2.9.5 && \
-    git version
-
-
-
-# Set the locale(en_US.UTF-8)
-ENV LANG en_US.UTF-8
-ENV LANGUAGE en_US:en
-ENV LC_ALL en_US.UTF-8
-
-# USER jenkins
 WORKDIR /home/jenkins
 
-ENV SONAR_SCANNER_VERSION 3.3.0.1492
-
-RUN curl -o sonar_scanner.zip https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-${SONAR_SCANNER_VERSION}-linux.zip && \
-    unzip sonar_scanner.zip && rm sonar_scanner.zip \
-    && rm -rf sonar-scanner-$SONAR_SCANNER_VERSION-linux/jre && \
-    sed -i 's/use_embedded_jre=true/use_embedded_jre=false/g' /home/jenkins/sonar-scanner-$SONAR_SCANNER_VERSION-linux/bin/sonar-scanner && \
-    mv /home/jenkins/sonar-scanner-$SONAR_SCANNER_VERSION-linux /usr/bin
-
-ENV PATH $PATH:/usr/bin/sonar-scanner-$SONAR_SCANNER_VERSION-linux/bin
-
 COPY ./ ./
 RUN ./hack/install_utils.sh && rm -rf ./*
 

base/hack/install_utils.sh

@@ -4,70 +4,10 @@ ARCH=$(uname -m)
 
 echo $ARCH
 
-if [[ ${EXCLUDE_DOCKER} != '1' ]]; then
-  # Docker
-  DOCKER_VERSION=18.09.9
-  if [[ ${ARCH} == 'x86_64' ]]; then
-    curl -f https://download.docker.com/linux/static/stable/x86_64/docker-$DOCKER_VERSION.tgz | tar xvz && \
-    mv docker/docker /usr/bin/ && \
-    rm -rf docker
-  elif [[ ${ARCH} == 'aarch64' ]]
-  then
-    curl -f https://download.docker.com/linux/static/stable/aarch64/docker-$DOCKER_VERSION.tgz | tar xvz && \
-    mv docker/docker /usr/bin/ && \
-    rm -rf docker
-  else
-    echo "do not support this arch"
-    exit 1
-  fi
-fi
-
-# Helm
-HELM_VERSION=2.11.0
-HELM3_VERSIOIN=3.5.0
-
-if [[ ${ARCH} == 'x86_64' ]]; then
-  curl -f https://get.helm.sh/helm-v${HELM_VERSION}-linux-amd64.tar.gz  | tar xzv && \
-  mv linux-amd64/helm /usr/bin/ && \
-  mv linux-amd64/tiller /usr/bin/ && \
-  rm -rf linux-amd64
-
-  curl -f https://get.helm.sh/helm-v${HELM3_VERSIOIN}-linux-amd64.tar.gz | tar xzv && \
-  mv linux-amd64/helm /usr/bin/helm3 && \
-  rm -rf linux-amd64 
-elif [[ ${ARCH} == 'aarch64' ]]
-then
-  curl -f https://get.helm.sh/helm-v${HELM_VERSION}-linux-arm64.tar.gz  | tar xzv && \
-  mv linux-arm64/helm /usr/bin/ && \
-  mv linux-arm64/tiller /usr/bin/ && \
-  rm -rf linux-arm64
-
-  curl -f https://get.helm.sh/helm-v${HELM3_VERSIOIN}-linux-arm64.tar.gz | tar xzv && \
-  mv linux-arm64/helm /usr/bin/helm3 && \
-  rm -rf linux-arm64 
-else
-  echo "do not support this arch"
-  exit 1
-fi
-
-# kubectl
-
-if [[ ${ARCH} == 'x86_64' ]]; then
-  curl -f -LO https://storage.googleapis.com/kubernetes-release/release/$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)/bin/linux/amd64/kubectl && \
-  chmod +x kubectl && \
-  mv kubectl /usr/bin/
-elif [[ ${ARCH} == 'aarch64' ]]
-then
-  curl -f -LO https://storage.googleapis.com/kubernetes-release/release/$(curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt)/bin/linux/arm64/kubectl && \
-  chmod +x kubectl && \
-  mv kubectl /usr/bin/ && kubectl --help
-else
-  echo "do not support this arch"
-  exit 1
-fi
+rm -rf /usr/bin/ks
 
 # ks
-KS_VERSION=0.0.64
+KS_VERSION=0.0.72
 if [[ ${ARCH} == 'x86_64' ]]; then
   curl -fL https://github.com/kubesphere-sigs/ks/releases/download/v${KS_VERSION}/ks-linux-amd64.tar.gz | tar xzv && \
   mv ks /usr/bin/
@@ -79,17 +19,3 @@ else
   echo "do not support this arch"
   exit 1
 fi
-
-# kustomize
-KUSTOMIZE_VERSION=4.5.3
-if [[ ${ARCH} == 'x86_64' ]]; then
-  curl -fL https://github.com/kubernetes-sigs/kustomize/releases/download/kustomize%2Fv${KUSTOMIZE_VERSION}/kustomize_v${KUSTOMIZE_VERSION}_linux_amd64.tar.gz | tar xzv && \
-  mv kustomize /usr/bin/
-elif [[ ${ARCH} == 'aarch64' ]]
-then
-  curl -fL https://github.com/kubernetes-sigs/kustomize/releases/download/kustomize%2Fv${KUSTOMIZE_VERSION}/kustomize_v${KUSTOMIZE_VERSION}_linux_arm64.tar.gz | tar xzv && \
-  mv kustomize /usr/bin/
-else
-  echo "do not support this arch"
-  exit 1
-fi

base/podman/Dockerfile

@@ -1,70 +1,10 @@
-FROM centos:7
+FROM kubesphere/builder-base:v3.2.2-podman
 
-# utils
-RUN yum install -y epel-release ca-certificates && \
-  yum install -y unzip \
-  which \
-  make \
-  wget \
-  zip \
-  bzip2 \
-  gcc \
-  gcc-c++ \
-  curl-devel \
-  autoconf \
-  expat-devel \
-  gettext-devel \
-  openssl-devel \
-  perl-devel \
-  zlib-devel \
-  python-pip \
-  java-1.8.0-openjdk && \
-  yum -y clean all --enablerepo='*'
-
-RUN wget https://mirrors.edge.kernel.org/pub/software/scm/git/git-2.9.5.tar.gz && \
-    tar zxvf git-2.9.5.tar.gz --no-same-owner && \
-    cd git-2.9.5 && \
-    make configure && \
-    ./configure prefix=/usr/local/git/ && \
-    make && \
-    make install && \
-    mv /usr/local/git/bin/git /usr/bin/ && \
-    cd .. && \
-    rm -rf git-2.9.5.tar.gz git-2.9.5 && \
-    git version
-
-# Set the locale(en_US.UTF-8)
-ENV LANG en_US.UTF-8
-ENV LANGUAGE en_US:en
-ENV LC_ALL en_US.UTF-8
-
-# USER jenkins
 WORKDIR /home/jenkins
 
-ENV SONAR_SCANNER_VERSION 3.3.0.1492
-
-RUN curl -o sonar_scanner.zip https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-${SONAR_SCANNER_VERSION}-linux.zip && \
-    unzip sonar_scanner.zip && rm sonar_scanner.zip \
-    && rm -rf sonar-scanner-$SONAR_SCANNER_VERSION-linux/jre && \
-    sed -i 's/use_embedded_jre=true/use_embedded_jre=false/g' /home/jenkins/sonar-scanner-$SONAR_SCANNER_VERSION-linux/bin/sonar-scanner && \
-    mv /home/jenkins/sonar-scanner-$SONAR_SCANNER_VERSION-linux /usr/bin
-
-ENV PATH $PATH:/usr/bin/sonar-scanner-$SONAR_SCANNER_VERSION-linux/bin
-
 COPY ./ ./
-
-ENV EXCLUDE_DOCKER 1
 RUN ./hack/install_utils.sh && rm -rf ./*
 
-# Install podman
-RUN curl -L -o /etc/yum.repos.d/devel:kubic:libcontainers:stable.repo https://download.opensuse.org/repositories/devel:/kubic:/libcontainers:/stable/CentOS_7/devel:kubic:libcontainers:stable.repo && \
-    yum -y install podman fuse-overlayfs && \
-    ln -s /usr/bin/podman /usr/bin/docker && \
-    yum -y clean all --enablerepo='*'
-
-COPY storage.conf /etc/containers/storage.conf
-COPY containers.conf /etc/containers/containers.conf
-
 VOLUME /var/lib/containers
 
 CMD ["podman", "info"]