Skip to content

Commit

Permalink
Merge pull request #4 from improbable-eng/bugfix/docker-invocation
Browse files Browse the repository at this point in the history
Remove unnecessary double-dash in docker run invocation
  • Loading branch information
Helcaraxan authored Jul 6, 2021
2 parents 50d931a + 8598eb9 commit 9606c63
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ steps:
- label: integration-tests
command: ./integration-tests.sh
plugins:
- improbable-eng/docker-service#v0.2.0:
- improbable-eng/docker-service#v0.3.0:
container: postgres:12.6
flags:
- --env=POSTGRES_DB=postgres
Expand All @@ -41,7 +41,7 @@ steps:
- label: my-step
command: ./step-script.sh
plugins:
- improbable-eng/docker-service#v0.2.0:
- improbable-eng/docker-service#v0.3.0:
container: a-container:1.2.3
cmd: "my-command --flag=value arg1 arg1"
```
Expand All @@ -65,7 +65,7 @@ by using the [Docker Buildkite plugin] with its `network` option.
steps:
- label: my-dockerised-step
plugins:
- improbable-eng/docker-service#v0.2.0:
- improbable-eng/docker-service#v0.3.0:
container: postgres:12.6
network: "postgres"
flags:
Expand Down
2 changes: 1 addition & 1 deletion hooks/pre-command
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ unset parse_flags
docker_cmd="${docker_cmd} ${BUILDKITE_PLUGIN_DOCKER_SERVICE_CONTAINER}"

if [[ -n "${BUILDKITE_PLUGIN_DOCKER_SERVICE_CMD:-}" ]]; then
docker_cmd="${docker_cmd} -- ${BUILDKITE_PLUGIN_DOCKER_SERVICE_CMD}"
docker_cmd="${docker_cmd} ${BUILDKITE_PLUGIN_DOCKER_SERVICE_CMD}"
fi

DOCKER_SERVICE_CONTAINER_ID="$(eval "${docker_cmd}")"
Expand Down

0 comments on commit 9606c63

Please sign in to comment.