fix arm64 C++ tests broken by dockcross image update

pull/8944/head
Jan Tattermusch 3 years ago
parent 981326af1d
commit 2bd61368de
  1. 7
      kokoro/linux/aarch64/dockcross_helpers/run_dockcross_linux_aarch64.sh

@ -12,11 +12,14 @@ else
DOCKER_TTY_ARGS= DOCKER_TTY_ARGS=
fi fi
# Pin the dockcross image since newer versions of the image break the build
PINNED_DOCKCROSS_IMAGE_VERSION=dockcross/linux-arm64:20210625-795dd4d
# running dockcross image without any arguments generates a wrapper # running dockcross image without any arguments generates a wrapper
# scripts that can be used to run commands under the dockcross image # scripts that can be used to run commands under the dockcross image
# easily. # easily.
# See https://github.com/dockcross/dockcross#usage for details # See https://github.com/dockcross/dockcross#usage for details
docker run $DOCKER_TTY_ARGS --rm dockcross/linux-arm64 >dockcross-linux-arm64.sh docker run $DOCKER_TTY_ARGS --rm $PINNED_DOCKCROSS_IMAGE_VERSION >dockcross-linux-arm64.sh
chmod +x dockcross-linux-arm64.sh chmod +x dockcross-linux-arm64.sh
# the wrapper script has CRLF line endings and bash doesn't like that # the wrapper script has CRLF line endings and bash doesn't like that
@ -30,4 +33,4 @@ sed -i 's/\r//g' dockcross-linux-arm64.sh
# * the processes in the container run under the same UID and GID as the host process so unlike # * the processes in the container run under the same UID and GID as the host process so unlike
# vanilla "docker run" invocations, the workspace doesn't get polluted with files # vanilla "docker run" invocations, the workspace doesn't get polluted with files
# owned by root. # owned by root.
./dockcross-linux-arm64.sh "$@" ./dockcross-linux-arm64.sh --image $PINNED_DOCKCROSS_IMAGE_VERSION -- "$@"

Loading…
Cancel
Save