removes extra buildx install (#1227)

aws · Oct 31, 2023 · a19fc32 · a19fc32
1 parent d0884d2
commit a19fc32
Show file tree

Hide file tree

Showing 8 changed files with 1 addition and 61 deletions.
diff --git a/builder-base/Dockerfile b/builder-base/Dockerfile
@@ -69,18 +69,6 @@ RUN --mount=type=cache,target=/var/cache/yum,sharing=locked \
     /install_gh_cli.sh && \
     /remove_yum_packages.sh
 
-FROM ${BUILDER_IMAGE} as docker_buildx
-ARG TARGETARCH
-WORKDIR /workdir
-ARG DOCKER_BUILDX_VERSION
-ENV DOCKER_BUILDX_VERSION=$DOCKER_BUILDX_VERSION
-COPY ./scripts/install_base_yum_packages.sh ./scripts/remove_yum_packages.sh ./scripts/common_vars.sh \
-    ./scripts/install_docker_buildx.sh ./checksums/docker-buildx-${TARGETARCH}-checksum /
-RUN --mount=type=cache,target=/var/cache/yum,sharing=locked \
-    /install_base_yum_packages.sh && \
-    /install_docker_buildx.sh && \
-    /remove_yum_packages.sh
-
 FROM ${BUILDER_IMAGE} as yq
 ARG TARGETARCH
 WORKDIR /workdir
@@ -433,7 +421,6 @@ COPY --link --from=hugo /hugo /
 COPY --link --from=govc /govc /
 COPY --link --from=helm /helm /
 COPY --link --from=tuftool /tuftool /
-COPY --link --from=docker_buildx /docker_buildx /
 COPY --link --from=buildkit /buildkit /
 COPY --link --from=skopeo /skopeo /
 

diff --git a/builder-base/checksums/docker-buildx-amd64-checksum b/builder-base/checksums/docker-buildx-amd64-checksum
diff --git a/builder-base/checksums/docker-buildx-arm64-checksum b/builder-base/checksums/docker-buildx-arm64-checksum
diff --git a/builder-base/scripts/install_docker_buildx.sh b/builder-base/scripts/install_docker_buildx.sh
diff --git a/builder-base/scripts/update_shasums.sh b/builder-base/scripts/update_shasums.sh
@@ -48,9 +48,6 @@ for TARGETARCH in arm64 amd64; do
     sha256=$(curl -sSL --retry 5 $BUILDKIT_DOWNLOAD_URL | sha256sum | awk '{print $1}')
     echo "$sha256  buildkit-$BUILDKIT_VERSION.linux-$TARGETARCH.tar.gz" > $CHECKSUMS_ROOT/checksums/buildkit-$TARGETARCH-checksum
 
-    # DOCKER_BUILDX
-    echo "$(curl -sSL --retry 5 -v --silent $DOCKER_BUILDX_CHECKSUM_URL 2>&1 | grep buildx-${DOCKER_BUILDX_VERSION}.linux-$TARGETARCH | cut -d ":" -f 2)" > $CHECKSUMS_ROOT/checksums/docker-buildx-$TARGETARCH-checksum
-
     # GITHUB CLI
     echo "$(curl -sSL --retry 5 -v --silent $GITHUB_CLI_CHECKSUM_URL 2>&1 | grep  gh_${GITHUB_CLI_VERSION}_linux_$TARGETARCH.tar.gz | cut -d ":" -f 2)" > $CHECKSUMS_ROOT/checksums/github-cli-$TARGETARCH-checksum
 

diff --git a/builder-base/scripts/validate_components.sh b/builder-base/scripts/validate_components.sh
@@ -26,7 +26,7 @@ yq --version
 gh --version
 govc version
 helm version
-/usr/local/lib/docker/cli-plugins/docker-buildx version
+docker buildx version
 buildctl --version
 aws --version
 bash --version

diff --git a/builder-base/scripts/versions.sh b/builder-base/scripts/versions.sh
@@ -19,7 +19,6 @@ export SKIP_INSTALL="true"
 
 source $SCRIPT_ROOT/install_aws_cli.sh
 source $SCRIPT_ROOT/install_buildkit.sh
-source $SCRIPT_ROOT/install_docker_buildx.sh
 source $SCRIPT_ROOT/install_ecr_cred_helper.sh
 source $SCRIPT_ROOT/install_gh_cli.sh
 source $SCRIPT_ROOT/install_yq.sh

diff --git a/builder-base/versions.yaml b/builder-base/versions.yaml
@@ -1,7 +1,6 @@
 AMAZON_ECR_CRED_HELPER_VERSION: 0.6.0
 ANSIBLE_VERSION: 2.15.3
 BUILDKIT_VERSION: v0.10.5
-DOCKER_BUILDX_VERSION: v0.9.1
 GITHUB_CLI_VERSION: 2.21.1
 GOLANG_VERSION_117: 1.17.13-6
 GOLANG_VERSION_118: 1.18.10-8