Skip to content

Commit

Permalink
Merge pull request google#3486 from bobbypage/release-v0.49
Browse files Browse the repository at this point in the history
Cherrpick google#3485 to release-v0.49- Remove s390x support
  • Loading branch information
bobbypage committed Mar 2, 2024
2 parents 483a3b3 + 95c72a7 commit 74350be
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion build/check_container.sh
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
target_image=$1

# Architectures officially supported by cadvisor
arches=( "amd64" "arm" "arm64" "s390x" )
arches=( "amd64" "arm" "arm64" )

# Docker doesn't handle images with different architectures but the same tag.
# Remove the container and the image use by it to avoid problems.
Expand Down
2 changes: 1 addition & 1 deletion build/release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ docker buildx inspect cadvisor-builder > /dev/null \
# Build binaries

# A mapping of the docker arch name to the qemu arch name
declare -A arches=( ["amd64"]="x86_64" ["arm"]="arm" ["arm64"]="aarch64" ["s390x"]="s390x")
declare -A arches=( ["amd64"]="x86_64" ["arm"]="arm" ["arm64"]="aarch64" )

for arch in "${arches[@]}"; do
if ! hash "qemu-${arch}-static"; then
Expand Down

0 comments on commit 74350be

Please sign in to comment.