Fix typo and a couple minor log updates (#13436)

This commit is contained in:
Mike Tesch
2025-12-15 12:59:17 -05:00
committed by GitHub
parent 2e271cf1d9
commit 7afeca2a81
5 changed files with 9 additions and 6 deletions

View File

@@ -50,4 +50,4 @@ apt-get update
# Install jq # Install jq
apt-get install jq apt-get install jq
echo "ubuntu ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers echo "ubuntu ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers

View File

@@ -78,7 +78,7 @@ append_etc_environment_path() {
# /etc/environment # /etc/environment
# #
# TODO: there might be the others variables to be processed in the same way as "PATH" variable # TODO: there might be the others variables to be processed in the same way as "PATH" variable
# ie MANPATH, INFOPATH, LD_*, etc. In the current implementation the values from /etc/evironments # ie MANPATH, INFOPATH, LD_*, etc. In the current implementation the values from /etc/environment
# replace the values of the current environment # replace the values of the current environment
reload_etc_environment() { reload_etc_environment() {
# add `export ` to every variable of /etc/environment except PATH and eval the result shell script # add `export ` to every variable of /etc/environment except PATH and eval the result shell script

View File

@@ -231,7 +231,7 @@ use_checksum_comparison() {
echo "Checksum verification failed. Expected hash: $checksum; Actual hash: $local_file_hash." echo "Checksum verification failed. Expected hash: $checksum; Actual hash: $local_file_hash."
exit 1 exit 1
else else
echo "Checksum verification passed" echo "Checksum verification passed. Expected hash: $checksum; Actual hash: $local_file_hash."
fi fi
} }
@@ -240,4 +240,4 @@ get_toolset_value() {
local query=$1 local query=$1
echo "$(jq -r "$query" $toolset_path)" echo "$(jq -r "$query" $toolset_path)"
} }

View File

@@ -51,7 +51,10 @@ run_test() {
# Build the image only if using the default name (for backward compatibility) # Build the image only if using the default name (for backward compatibility)
if [[ "$IMAGE_NAME" == "ubuntu-slim:test" ]]; then if [[ "$IMAGE_NAME" == "ubuntu-slim:test" ]]; then
echo "Building image: $IMAGE_NAME" echo "Building image: $IMAGE_NAME"
docker build --debug --progress plain -t "$IMAGE_NAME" . if ! docker build --no-cache --debug --progress plain -t "$IMAGE_NAME" .; then
echo "Error: Docker build failed"
exit 1
fi
else else
# Check if the image exists # Check if the image exists
if ! docker image inspect "$IMAGE_NAME" >/dev/null 2>&1; then if ! docker image inspect "$IMAGE_NAME" >/dev/null 2>&1; then

View File

@@ -78,7 +78,7 @@ append_etc_environment_path() {
# /etc/environment # /etc/environment
# #
# TODO: there might be the others variables to be processed in the same way as "PATH" variable # TODO: there might be the others variables to be processed in the same way as "PATH" variable
# ie MANPATH, INFOPATH, LD_*, etc. In the current implementation the values from /etc/evironments # ie MANPATH, INFOPATH, LD_*, etc. In the current implementation the values from /etc/environment
# replace the values of the current environment # replace the values of the current environment
reload_etc_environment() { reload_etc_environment() {
# add `export ` to every variable of /etc/environment except PATH and eval the result shell script # add `export ` to every variable of /etc/environment except PATH and eval the result shell script