diff --git a/ci/do_ci.sh b/ci/do_ci.sh index c9421a0c90ae8..41d0365849135 100755 --- a/ci/do_ci.sh +++ b/ci/do_ci.sh @@ -150,7 +150,7 @@ function run_process_test_result() { function run_ci_verify () { echo "verify examples..." - docker load < "$ENVOY_DOCKER_BUILD_DIR/docker/envoy-docker-images.tar.xz" + LC_ALL=C docker load < "$ENVOY_DOCKER_BUILD_DIR/docker/envoy-docker-images.tar.xz" _images=$(docker image list --format "{{.Repository}}") while read -r line; do images+=("$line"); done \ <<< "$_images" diff --git a/ci/docker_ci.sh b/ci/docker_ci.sh index 439647ebe779b..98e869e4fa92a 100755 --- a/ci/docker_ci.sh +++ b/ci/docker_ci.sh @@ -144,7 +144,7 @@ done mkdir -p "${ENVOY_DOCKER_IMAGE_DIRECTORY}" ENVOY_DOCKER_TAR="${ENVOY_DOCKER_IMAGE_DIRECTORY}/envoy-docker-images.tar.xz" echo "Saving built images to ${ENVOY_DOCKER_TAR}." -docker save "${IMAGES_TO_SAVE[@]}" | xz -T0 -2 >"${ENVOY_DOCKER_TAR}" +LC_ALL=C docker save "${IMAGES_TO_SAVE[@]}" | LC_ALL=C xz -T0 -2 >"${ENVOY_DOCKER_TAR}" # Only push images for main builds, release branch builds, and tag builds. if [[ "${AZP_BRANCH}" != "${MAIN_BRANCH}" ]] && diff --git a/test/exe/version_out_test.sh b/test/exe/version_out_test.sh index 6308287a2ce01..2adc293236c40 100755 --- a/test/exe/version_out_test.sh +++ b/test/exe/version_out_test.sh @@ -2,6 +2,9 @@ set -e -o pipefail +# Undo LC_ALL=en_US.UTF-8, since it breaks sed. +export LC_ALL=C + ENVOY_BIN="${TEST_SRCDIR}/envoy/source/exe/envoy-static" COMMIT=$(${ENVOY_BIN} --version | \