Revert "Add multi-arch image via Bazel (GoogleContainerTools#1452)"

This reverts commit a310cc6.
tejal29 · Dec 11, 2020 · 50ea5f5 · 50ea5f5
1 parent e668394
commit 50ea5f5
Show file tree

Hide file tree

Showing 18 changed files with 38 additions and 389 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,7 +1,4 @@
 out/
-bazel-*
-*~
-BUILD.bazel
 .idea
 *.iml
 .vagrant
diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,6 @@
 language: go
 os: linux
 dist: bionic
-
 env:
   global:
     - IMAGE_REPO=localhost:5000 REGISTRY=localhost:5000
@@ -36,28 +35,3 @@ jobs:
         - make travis-setup
       script:
         - make integration-test-misc
-
-    - name: bazel amd64
-      arch: amd64
-      env: CPU=k8
-      before_install: &before_install_multiarch
-        - export PATH=$PATH:$HOME/bin && mkdir -p $HOME/bin
-        - eval $(go env)
-        # install bazelisk as bazel to install the appropriate bazel version
-        - wget https://github.com/bazelbuild/bazelisk/releases/download/v1.6.1/bazelisk-linux-${GOARCH} && chmod +x bazelisk-linux-${GOARCH} && mv bazelisk-linux-${GOARCH} $HOME/bin/bazel
-      script: &script_multiarch
-        # Generate BUILD.bazel files (we do not check them in)
-        - bazel run //:gazelle
-        - bazel build --cpu=${CPU} --curses=no //integration:all
-        # Build all targets tagged with our architecture:
-        - bazel build --cpu=${CPU} --curses=no $(bazel query 'attr("tags", "'${GOARCH}'", "//...")')
-        # Run all tests not tagged as "manual":
-        - bazel test  --cpu=${CPU} --curses=no --test_output=errors --test_timeout=900 //integration:all
-        # Run all tests tagged with our architecture:
-        - bazel test  --cpu=${CPU} --curses=no --test_output=errors --test_timeout=900 $(bazel query 'attr("tags", "'${GOARCH}'", "//...")')
-
-    - name: bazel arm64
-      arch: arm64
-      env: CPU=aarch64
-      before_install: *before_install_multiarch
-      script: *script_multiarch
diff --git a/BUILD b/BUILD
diff --git a/Makefile b/Makefile
@@ -88,9 +88,9 @@ integration-test-misc:
 
 .PHONY: images
 images:
-	docker build ${BUILD_ARG} --build-arg=GOARCH=$(GOARCH) -t $(REGISTRY)/executor:latest -f deploy/Dockerfile .
-	docker build ${BUILD_ARG} --build-arg=GOARCH=$(GOARCH) -t $(REGISTRY)/executor:debug -f deploy/Dockerfile_debug .
-	docker build ${BUILD_ARG} --build-arg=GOARCH=$(GOARCH) -t $(REGISTRY)/warmer:latest -f deploy/Dockerfile_warmer .
+	docker build ${BUILD_ARG} --build-arg=TARGETARCH=$(GOARCH) --build-arg=BUILDPLATFORM=linux/$(GOARCH) -t $(REGISTRY)/executor:latest -f deploy/Dockerfile .
+	docker build ${BUILD_ARG} --build-arg=TARGETARCH=$(GOARCH) --build-arg=BUILDPLATFORM=linux/$(GOARCH) -t $(REGISTRY)/executor:debug -f deploy/Dockerfile_debug .
+	docker build ${BUILD_ARG} --build-arg=TARGETARCH=$(GOARCH) --build-arg=BUILDPLATFORM=linux/$(GOARCH) -t $(REGISTRY)/warmer:latest -f deploy/Dockerfile_warmer .
 
 .PHONY: push
 push:

diff --git a/WORKSPACE b/WORKSPACE
diff --git a/cmd/executor/BUILD b/cmd/executor/BUILD
@@ -1,61 +0,0 @@
-load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library")
-load("@io_bazel_rules_docker//container:container.bzl", "container_image")
-
-go_library(
-    name = "executor_lib",
-    srcs = ["main.go"],
-    importpath = "github.com/GoogleContainerTools/kaniko/cmd/executor",
-    visibility = ["//visibility:private"],
-    deps = ["//cmd/executor/cmd"],
-)
-
-go_binary(
-    name = "executor",
-    embed = [":executor_lib"],
-    pure = "on",
-    visibility = ["//visibility:public"],
-)
-
-ARCHITECTURES = [
-    "amd64",
-    "arm64",
-    "s390x",
-]
-
-[
-    go_binary(
-        name = "executor_" + arch,
-        embed = [":executor_lib"],
-        goarch = arch,
-        goos = "linux",
-        pure = "on",
-        visibility = ["//visibility:public"],
-    )
-    for arch in ARCHITECTURES
-]
-
-[
-    container_image(
-        name = "image_" + arch,
-        architecture = arch,
-        base = "//files:image",
-        directory = "/kaniko",
-        entrypoint = ["/kaniko/executor_" + arch],
-        env = {
-            "HOME": "/root",
-            "USER": "root",
-            "PATH": "/usr/local/bin:/kaniko",
-            "SSL_CERT_DIR": "/kaniko/ssl/certs",
-            "DOCKER_CONFIG": "/kaniko/.docker/",
-        },
-        files = [
-            ":executor_" + arch,
-        ],
-        symlinks = {
-            "/kaniko/executor": "/kaniko/executor_" + arch,
-        },
-        visibility = ["//visibility:public"],
-        workdir = "/workspace",
-    )
-    for arch in ARCHITECTURES
-]

diff --git a/deploy/Dockerfile b/deploy/Dockerfile
@@ -14,8 +14,10 @@
 
 # Builds the static Go image to execute in a Kubernetes job
 
-FROM golang:1.14
-ARG GOARCH=amd64
+ARG BUILDPLATFORM
+FROM --platform=${BUILDPLATFORM} golang:1.14
+ARG TARGETARCH
+
 WORKDIR /go/src/github.com/GoogleContainerTools/kaniko
 # Get GCR credential helper
 ADD https://github.com/GoogleCloudPlatform/docker-credential-gcr/releases/download/v2.0.2/docker-credential-gcr_linux_amd64-2.0.2.tar.gz /usr/local/bin/
@@ -34,7 +36,7 @@ RUN tar --no-same-owner -C /usr/local/bin/ -xvzf /usr/local/bin/docker-credentia
 RUN mkdir -p /kaniko/.docker
 
 COPY . .
-RUN make GOARCH=${GOARCH}
+RUN make GOARCH=${TARGETARCH}
 
 FROM scratch
 COPY --from=0 /go/src/github.com/GoogleContainerTools/kaniko/out/executor /kaniko/executor

diff --git a/deploy/Dockerfile_debug b/deploy/Dockerfile_debug
@@ -15,7 +15,8 @@
 # Builds the static Go image to execute in a Kubernetes job
 
 # Stage 0: Build the executor binary and get credential helpers
-FROM --platform=${BUILDPLATFORM} golang:1.14 AS builder
+ARG BUILDPLATFORM
+FROM --platform=${BUILDPLATFORM} golang:1.14
 ARG TARGETARCH
 
 WORKDIR /go/src/github.com/GoogleContainerTools/kaniko
@@ -39,18 +40,18 @@ COPY . .
 RUN make GOARCH=${TARGETARCH} && make out/warmer
 
 FROM scratch
-COPY --from=builder /go/src/github.com/GoogleContainerTools/kaniko/out/* /kaniko/
-COPY --from=builder /usr/local/bin/docker-credential-gcr /kaniko/docker-credential-gcr
+COPY --from=0 /go/src/github.com/GoogleContainerTools/kaniko/out/* /kaniko/
+COPY --from=0 /usr/local/bin/docker-credential-gcr /kaniko/docker-credential-gcr
 COPY --from=0 /go/src/github.com/awslabs/amazon-ecr-credential-helper/bin/linux-amd64/docker-credential-ecr-login /kaniko/docker-credential-ecr-login
-COPY --from=builder /usr/local/bin/docker-credential-acr-linux /kaniko/docker-credential-acr
-COPY --from=builder /usr/local/bin/docker-credential-acr-env /kaniko/docker-credential-acr-env
+COPY --from=0 /usr/local/bin/docker-credential-acr-linux /kaniko/docker-credential-acr
+COPY --from=0 /usr/local/bin/docker-credential-acr-env /kaniko/docker-credential-acr-env
 COPY --from=amd64/busybox:1.31.1 /bin /busybox
 
 # Declare /busybox as a volume to get it automatically in the path to ignore
 VOLUME /busybox
 
 COPY files/ca-certificates.crt /kaniko/ssl/certs/
-COPY --from=builder /kaniko/.docker /kaniko/.docker
+COPY --from=0 /kaniko/.docker /kaniko/.docker
 COPY files/nsswitch.conf /etc/nsswitch.conf
 ENV HOME /root
 ENV USER /root

diff --git a/deploy/Dockerfile_warmer b/deploy/Dockerfile_warmer
@@ -14,7 +14,8 @@
 
 # Builds the static Go image to execute in a Kubernetes job
 
-FROM --platform=${BUILDPLATFORM} golang:1.14 AS builder
+ARG BUILDPLATFORM
+FROM --platform=${BUILDPLATFORM} golang:1.14
 ARG TARGETARCH
 
 # Get GCR credential helper
@@ -33,12 +34,12 @@ COPY . .
 RUN make GOARCH=${TARGETARCH}  out/warmer
 
 FROM scratch
-COPY --from=builder /go/src/github.com/GoogleContainerTools/kaniko/out/warmer /kaniko/warmer
-COPY --from=builder /usr/local/bin/docker-credential-gcr /kaniko/docker-credential-gcr
-COPY --from=builder /go/src/github.com/awslabs/amazon-ecr-credential-helper/bin/linux-amd64/docker-credential-ecr-login /kaniko/docker-credential-ecr-login
-COPY --from=builder /usr/local/bin/docker-credential-acr-linux /kaniko/docker-credential-acr
+COPY --from=0 /go/src/github.com/GoogleContainerTools/kaniko/out/warmer /kaniko/warmer
+COPY --from=0 /usr/local/bin/docker-credential-gcr /kaniko/docker-credential-gcr
+COPY --from=0 /go/src/github.com/awslabs/amazon-ecr-credential-helper/bin/linux-amd64/docker-credential-ecr-login /kaniko/docker-credential-ecr-login
+COPY --from=0 /usr/local/bin/docker-credential-acr-linux /kaniko/docker-credential-acr
 COPY files/ca-certificates.crt /kaniko/ssl/certs/
-COPY --from=builder /kaniko/.docker /kaniko/.docker
+COPY --from=0 /kaniko/.docker /kaniko/.docker
 COPY files/nsswitch.conf /etc/nsswitch.conf
 ENV HOME /root
 ENV USER /root

diff --git a/deploy/cloudbuild-release.yaml b/deploy/cloudbuild-release.yaml
@@ -10,34 +10,16 @@ steps:
   - name: "gcr.io/cloud-builders/docker"
     args: ["tag", "gcr.io/kaniko-project/executor:$TAG_NAME", 
            "gcr.io/kaniko-project/executor:latest"]
-  # Set up builder for muti-arch builds.
-  - name: 'gcr.io/cloud-builders/docker'
-    args: ['run', '--privileged', 'linuxkit/binfmt:v0.7']
-    id: 'initialize-qemu'
-  - name: 'gcr.io/cloud-builders/docker'
-    args: ['buildx', 'create', '--name', 'mybuilder']
-    id: 'create-builder'
-  - name: 'gcr.io/cloud-builders/docker'
-    args: ['buildx', 'use', 'mybuilder']
-    id: 'select-builder'
-  - name: 'gcr.io/cloud-builders/docker'
-    args: ['buildx', 'inspect', '--bootstrap']
-    id: 'show-target-build-platforms'
   # Then, we want to build kaniko:debug
-  - name: 'gcr.io/cloud-builders/docker'
-    args: ['buildx', 'build', '--platform', '$_DOCKER_BUILDX_PLATFORMS',  "-f", "deploy/Dockerfile_debug",
-           "-t", "gcr.io/kaniko-project/executor:debug-$TAG_NAME", "."]
   - name: "gcr.io/cloud-builders/docker"
-    args: ["tag", "gcr.io/kaniko-project/executor:debug-$TAG_NAME", 
-           "gcr.io/kaniko-project/executor:$TAG_NAME-debug"]
+    args: ["build", "-f", "deploy/Dockerfile_debug",
+           "-t", "gcr.io/kaniko-project/executor:debug-$TAG_NAME", "."]
   - name: "gcr.io/cloud-builders/docker"
     args: ["tag", "gcr.io/kaniko-project/executor:debug-$TAG_NAME", 
-           "gcr.io/kaniko-project/executor:debug"]       
-
-
+           "gcr.io/kaniko-project/executor:debug"]
   # Then, we want to build the cache warmer
   - name: "gcr.io/cloud-builders/docker"
-    args: ['buildx', 'build', '--platform', '$_DOCKER_BUILDX_PLATFORMS', "-f", "deploy/Dockerfile_warmer",
+    args: ["build", "-f", "deploy/Dockerfile_warmer",
            "-t", "gcr.io/kaniko-project/warmer:$TAG_NAME", "."]
   - name: "gcr.io/cloud-builders/docker"
     args: ["tag", "gcr.io/kaniko-project/warmer:$TAG_NAME", 
@@ -57,7 +39,6 @@ steps:
       bazel run //:gazelle
       bazel run --host_force_python=PY2 //cmd/executor:image_amd64
       bazel run --host_force_python=PY2 //cmd/executor:image_arm64
-      bazel run --host_force_python=PY2 //cmd/executor:image_s390x
 
   # Publish the individual container images
   - name: docker
@@ -73,15 +54,11 @@ steps:
       docker tag bazel/cmd/executor:image_amd64     gcr.io/kaniko-project/executor:amd64-$TAG_NAME
       docker tag bazel/cmd/executor:image_arm64     gcr.io/kaniko-project/executor:arm64
       docker tag bazel/cmd/executor:image_arm64     gcr.io/kaniko-project/executor:arm64-$TAG_NAME
-      docker tag bazel/cmd/executor:image_arm64     gcr.io/kaniko-project/executor:s390x
-      docker tag bazel/cmd/executor:image_arm64     gcr.io/kaniko-project/executor:s390x-$TAG_NAME
 
       docker push gcr.io/kaniko-project/executor:amd64
       docker push gcr.io/kaniko-project/executor:amd64-$TAG_NAME
       docker push gcr.io/kaniko-project/executor:arm64
       docker push gcr.io/kaniko-project/executor:arm64-$TAG_NAME
-      docker push gcr.io/kaniko-project/executor:s390x
-      docker push gcr.io/kaniko-project/executor:s390x-$TAG_NAME
 
   # Enable "manifest list" support in docker, and publish one covering the per-architecture
   # images published above.
@@ -105,25 +82,18 @@ steps:
 
       docker manifest create gcr.io/kaniko-project/executor:multi-arch \
          gcr.io/kaniko-project/executor:amd64 \
-         gcr.io/kaniko-project/executor:arm64 \
-         gcr.io/kaniko-project/executor:s390x
+         gcr.io/kaniko-project/executor:arm64
       docker manifest push gcr.io/kaniko-project/executor:multi-arch
 
       docker manifest create gcr.io/kaniko-project/executor:multi-arch-$TAG_NAME \
          gcr.io/kaniko-project/executor:amd64-$TAG_NAME \
-         gcr.io/kaniko-project/executor:arm64-$TAG_NAME \
-         gcr.io/kaniko-project/executor:s390x-$TAG_NAME
+         gcr.io/kaniko-project/executor:arm64-$TAG_NAME
       docker manifest push gcr.io/kaniko-project/executor:multi-arch-$TAG_NAME
 
+
 images: ["gcr.io/kaniko-project/executor:$TAG_NAME",
          "gcr.io/kaniko-project/executor:latest",
          "gcr.io/kaniko-project/executor:debug-$TAG_NAME",
          "gcr.io/kaniko-project/executor:debug",
          "gcr.io/kaniko-project/warmer:$TAG_NAME",
-         "gcr.io/kaniko-project/warmer:latest",
-         "gcr.io/kaniko-project/executor:$TAG_NAME-debug"]
-options:
-  env:
-  - 'DOCKER_CLI_EXPERIMENTAL=enabled'
-substitutions:
-  _DOCKER_BUILDX_PLATFORMS: 'linux/amd64,linux/arm64,linux/s390x'
+         "gcr.io/kaniko-project/warmer:latest"]