Skip to content

Commit 7681d07

Browse files
authored
Merge pull request #460 from tubaxenor/xc-ansi-deprecation
Fix ansi option deprecation
2 parents a597aa5 + 3eaca74 commit 7681d07

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

lib/shared.bash

+1-1
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ function run_docker_compose() {
241241
fi
242242

243243
if [[ "$(plugin_read_config ANSI "true")" == "false" ]] ; then
244-
command+=(--no-ansi)
244+
command+=(--ansi never)
245245
fi
246246

247247
# Enable compatibility mode for v3 files

tests/run.bats

+3-3
Original file line numberDiff line numberDiff line change
@@ -523,9 +523,9 @@ cmd3"
523523
export BUILDKITE_PLUGIN_DOCKER_COMPOSE_ANSI=false
524524

525525
stub docker \
526-
"compose --no-ansi -f docker-compose.yml -p buildkite1111 -f docker-compose.buildkite-1-override.yml pull myservice : echo pulled myservice" \
527-
"compose --no-ansi -f docker-compose.yml -p buildkite1111 -f docker-compose.buildkite-1-override.yml up -d --scale myservice=0 myservice : echo started dependencies for myservice" \
528-
"compose --no-ansi -f docker-compose.yml -p buildkite1111 -f docker-compose.buildkite-1-override.yml run --name buildkite1111_myservice_build_1 -T --rm myservice /bin/sh -e -c 'pwd' : echo ran myservice without ansi output"
526+
"compose --ansi never -f docker-compose.yml -p buildkite1111 -f docker-compose.buildkite-1-override.yml pull myservice : echo pulled myservice" \
527+
"compose --ansi never -f docker-compose.yml -p buildkite1111 -f docker-compose.buildkite-1-override.yml up -d --scale myservice=0 myservice : echo started dependencies for myservice" \
528+
"compose --ansi never -f docker-compose.yml -p buildkite1111 -f docker-compose.buildkite-1-override.yml run --name buildkite1111_myservice_build_1 -T --rm myservice /bin/sh -e -c 'pwd' : echo ran myservice without ansi output"
529529

530530
stub buildkite-agent \
531531
"meta-data exists docker-compose-plugin-built-image-tag-myservice : exit 0" \

tests/v1/run.bats

+3-3
Original file line numberDiff line numberDiff line change
@@ -479,9 +479,9 @@ cmd3"
479479
export BUILDKITE_PLUGIN_DOCKER_COMPOSE_ANSI=false
480480

481481
stub docker-compose \
482-
"--no-ansi -f docker-compose.yml -p buildkite1111 -f docker-compose.buildkite-1-override.yml pull myservice : echo pulled myservice" \
483-
"--no-ansi -f docker-compose.yml -p buildkite1111 -f docker-compose.buildkite-1-override.yml up -d --scale myservice=0 myservice : echo started dependencies for myservice" \
484-
"--no-ansi -f docker-compose.yml -p buildkite1111 -f docker-compose.buildkite-1-override.yml run --name buildkite1111_myservice_build_1 -T --rm myservice /bin/sh -e -c 'pwd' : echo ran myservice without ansi output"
482+
"--ansi never -f docker-compose.yml -p buildkite1111 -f docker-compose.buildkite-1-override.yml pull myservice : echo pulled myservice" \
483+
"--ansi never -f docker-compose.yml -p buildkite1111 -f docker-compose.buildkite-1-override.yml up -d --scale myservice=0 myservice : echo started dependencies for myservice" \
484+
"--ansi never -f docker-compose.yml -p buildkite1111 -f docker-compose.buildkite-1-override.yml run --name buildkite1111_myservice_build_1 -T --rm myservice /bin/sh -e -c 'pwd' : echo ran myservice without ansi output"
485485

486486
stub buildkite-agent \
487487
"meta-data exists docker-compose-plugin-built-image-tag-myservice : exit 0" \

0 commit comments

Comments
 (0)