From 4d9029547475362ee10210e75b92563eeee721dd Mon Sep 17 00:00:00 2001
From: Jeff <jeffzhang@yunify.com>
Date: Wed, 23 Jun 2021 16:38:24 +0000
Subject: [PATCH] remove unused line

Signed-off-by: Jeff <jeffzhang@yunify.com>
---
 .github/workflows/build-multiarch.yaml |  2 +-
 build/Dockerfile                       | 44 --------------------------
 build/ks-apiserver/Dockerfile          |  1 -
 3 files changed, 1 insertion(+), 46 deletions(-)
 delete mode 100644 build/Dockerfile

diff --git a/.github/workflows/build-multiarch.yaml b/.github/workflows/build-multiarch.yaml
index 64cdaadfb..2fd983352 100644
--- a/.github/workflows/build-multiarch.yaml
+++ b/.github/workflows/build-multiarch.yaml
@@ -39,4 +39,4 @@ jobs:
         if: github.event_name == 'push'
         run: |
           echo ${{ secrets.DOCKER_PASSWORD }} | docker login -u ${{ secrets.DOCKER_USERNAME }} --password-stdin
-          REPO=kubespheredev TAG=${GITHUB_REF#refs/heads/} make container-cross-push
+          REPO=kubespheredev TAG="${GITHUB_REF#refs/heads/}-multiarch" make container-cross-push
diff --git a/build/Dockerfile b/build/Dockerfile
deleted file mode 100644
index def8870c0..000000000
--- a/build/Dockerfile
+++ /dev/null
@@ -1,44 +0,0 @@
-FROM ubuntu:18.04 as binarydownloader
-ARG HELM_VERSION=v3.5.2
-ARG KUSTOMIZE_VERSION=v4.0.5
-ARG KUBE_VERSION=v1.16.4
-ARG ETCD_VERSION=v3.3.11
-RUN apt update && apt -y install wget curl
-ADD ./hack /opt/hack/
-
-RUN bash /opt/hack/build-scripts/get-helm.sh
-RUN bash /opt/hack/build-scripts/get-kustomize.sh
-RUN bash /opt/hack/build-scripts/get-etcd.sh
-RUN bash /opt/hack/build-scripts/get-kubernetes.sh
-
-
-FROM golang:1.13 as builder
-ADD . /opt/kubesphere/
-WORKDIR /opt/kubesphere/
-RUN apt update && apt -y install sudo
-RUN bash /opt/kubesphere/hack/install_kubebuilder.sh
-COPY --from=binarydownloader /usr/local/kubernetes/server/bin/kube-apiserver /usr/local/kubebuilder/bin/kube-apiserver
-COPY --from=binarydownloader /usr/local/kubernetes/server/bin/kubectl /usr/local/kubebuilder/bin/kubectl
-COPY --from=binarydownloader /usr/local/bin/etcd /usr/local/kubebuilder/bin/etcd
-RUN bash -c "source /opt/kubesphere/hack/init_env.sh && make ks-apiserver"
-RUN bash -c "source /opt/kubesphere/hack/init_env.sh && make ks-controller-manager"
-
-
-FROM alpine:3.11 as ks-apiserver
-RUN apk add --no-cache ca-certificates
-COPY --from=binarydownloader /usr/bin/helm /usr/bin/helm
-COPY --from=builder /opt/kubesphere/bin/cmd/ks-apiserver /usr/local/bin/
-
-EXPOSE 9090
-
-CMD ["sh"]
-
-FROM alpine:3.11 as ks-controller-manager
-RUN apk add --no-cache ca-certificates
-COPY --from=binarydownloader /usr/bin/helm /usr/bin/helm
-COPY --from=binarydownloader /usr/bin/kustomize /usr/bin/kustomize
-COPY --from=builder /opt/kubesphere/bin/cmd/controller-manager /usr/local/bin/
-
-EXPOSE 8443 8080
-
-CMD ["sh"]
\ No newline at end of file
diff --git a/build/ks-apiserver/Dockerfile b/build/ks-apiserver/Dockerfile
index 171c60603..b955e4573 100644
--- a/build/ks-apiserver/Dockerfile
+++ b/build/ks-apiserver/Dockerfile
@@ -31,7 +31,6 @@ WORKDIR /workspace
 ADD . /workspace/
 
 RUN make ks-apiserver
-RUN pwd && ls -alh
 RUN mv /workspace/bin/cmd/ks-apiserver ${OUTDIR}/usr/local/bin/
 
 ##############