Skip to content

Commit 9104607

Browse files
committed
remove run labels
Signed-off-by: Jared Quick <jared.quick@salesforce.com>
1 parent 39680d7 commit 9104607

4 files changed

Lines changed: 0 additions & 37 deletions

File tree

README.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -268,10 +268,6 @@ If set to true, adds useful Docker labels to the primary container. See [Contain
268268

269269
The default is `true`.
270270

271-
#### `labels` (run only, string or array)
272-
273-
A list of KEY=VALUE that are passed through as service labels when image is being ran. These will be merged with any service labels defined in the compose file.
274-
275271
#### `build-labels` (build only, string or array)
276272

277273
A list of KEY=VALUE that are passed through as service labels when image is being built. These will be merged with any service labels defined in the compose file.

commands/run.sh

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -92,10 +92,6 @@ if [[ "$(plugin_read_config RUN_LABELS "true")" =~ ^(true|on|1)$ ]]; then
9292
)
9393
fi
9494

95-
while read -r label ; do
96-
[[ -n "${label:-}" ]] && run_params+=("--label" "${label}")
97-
done <<< "$(plugin_read_list LABELS)"
98-
9995
# append env vars provided in ENV or ENVIRONMENT, these are newline delimited
10096
while IFS=$'\n' read -r env ; do
10197
[[ -n "${env:-}" ]] && run_params+=("-e" "${env}")

plugin.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,6 @@ configuration:
6666
type: boolean
6767
graceful-shutdown:
6868
type: boolean
69-
labels:
70-
type: [ string, array ]
71-
minimum: 1
7269
leave-volumes:
7370
type: boolean
7471
mount-buildkite-agent:
@@ -157,7 +154,6 @@ configuration:
157154
environment: [ run ]
158155
expand-volume-vars: [ volumes ]
159156
graceful-shutdown: [ run ]
160-
labels: [ run ]
161157
leave-volumes: [ run ]
162158
mount-buildkite-agent: [ run ]
163159
mount-checkout: [ run ]

tests/run.bats

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1280,28 +1280,3 @@ cmd3"
12801280
assert_output --partial "env-propagation-list desired, but LIST_OF_VARS is not defined!"
12811281
unstub buildkite-agent
12821282
}
1283-
1284-
@test "Run with a list of propagated labels" {
1285-
export BUILDKITE_PLUGIN_DOCKER_COMPOSE_LABELS_0="com.buildkite.test=test"
1286-
export BUILDKITE_PLUGIN_DOCKER_COMPOSE_LABELS_1="com.buildkite.test2=test2"
1287-
export BUILDKITE_COMMAND="echo hello world"
1288-
1289-
export BUILDKITE_PLUGIN_DOCKER_COMPOSE_RUN=myservice
1290-
export BUILDKITE_PLUGIN_DOCKER_COMPOSE_CHECK_LINKED_CONTAINERS=false
1291-
1292-
stub docker \
1293-
"compose -f docker-compose.yml -p buildkite1111 up -d --scale myservice=0 myservice : echo ran myservice dependencies" \
1294-
"compose -f docker-compose.yml -p buildkite1111 run --name buildkite1111_myservice_build_1 --label com.buildkite.test=test --label com.buildkite.test2=test2 -T --rm myservice /bin/sh -e -c 'echo hello world' : echo ran myservice"
1295-
1296-
stub buildkite-agent \
1297-
"meta-data exists docker-compose-plugin-built-image-tag-myservice : exit 1"
1298-
1299-
run "$PWD"/hooks/command
1300-
1301-
assert_success
1302-
refute_output --partial "Pulling"
1303-
assert_output --partial "ran myservice"
1304-
1305-
unstub docker
1306-
unstub buildkite-agent
1307-
}

0 commit comments

Comments
 (0)