fix(ci): remove useless make-rules

cnrancher · Apr 3, 2021 · 41ea90e · 41ea90e
1 parent 99c3f83
commit 41ea90e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 9 deletions.
diff --git a/hack/lib/docker.sh b/hack/lib/docker.sh
@@ -36,9 +36,9 @@ function autok3s::docker::login() {
 
 function autok3s::docker::prebuild() {
   docker run --rm --privileged multiarch/qemu-user-static --reset -p yes i
-  DOCKER_CLI_EXPERIMENTAL=enabled docker buildx create --name multibuilder
-  DOCKER_CLI_EXPERIMENTAL=enabled docker buildx inspect multibuilder --bootstrap
-  DOCKER_CLI_EXPERIMENTAL=enabled docker buildx use multibuilder
+  DOCKER_CLI_EXPERIMENTAL=enabled docker buildx create --name multi-builder
+  DOCKER_CLI_EXPERIMENTAL=enabled docker buildx inspect multi-builder --bootstrap
+  DOCKER_CLI_EXPERIMENTAL=enabled docker buildx use multi-builder
 }
 
 function autok3s::docker::build() {

diff --git a/hack/make-rules/autok3s.sh b/hack/make-rules/autok3s.sh
@@ -149,12 +149,6 @@ function package() {
   local platforms
   if [[ "${CROSS:-false}" == "true" ]]; then
     autok3s::log::info "crossed packaging"
-    local QEMU_ARCHS="arm aarch64"
-
-    for i in ${QEMU_ARCHS}; do
-      curl -fsSL https://github.com/multiarch/qemu-user-static/releases/download/v3.1.0-2/qemu-${i}-static.tar.gz | tar zxvf - -C /usr/bin;
-    done
-    chmod +x /usr/bin/qemu-*
     autok3s::docker::prebuild
     platforms=("${SUPPORTED_PLATFORMS[@]}")
   else