From ee4444771d72559da9b7751eb663dbe8a575d64d Mon Sep 17 00:00:00 2001 From: Ryan Ling Date: Fri, 9 Jul 2021 07:51:12 +1000 Subject: [PATCH] Default Docker Compose image to empty string (#469) --- .changeset/rich-crabs-end.md | 7 +++++++ template/express-rest-api/docker-compose.yml | 2 +- template/greeter/docker-compose.yml | 2 +- template/koa-rest-api/docker-compose.yml | 2 +- template/lambda-sqs-worker/docker-compose.yml | 2 +- 5 files changed, 11 insertions(+), 4 deletions(-) create mode 100644 .changeset/rich-crabs-end.md diff --git a/.changeset/rich-crabs-end.md b/.changeset/rich-crabs-end.md new file mode 100644 index 000000000..4bf54e9b9 --- /dev/null +++ b/.changeset/rich-crabs-end.md @@ -0,0 +1,7 @@ +--- +'skuba': patch +--- + +**template:** Default Docker Compose image to empty string + +This suppresses Docker Compose CLI warnings and errors when running outside of Buildkite. diff --git a/template/express-rest-api/docker-compose.yml b/template/express-rest-api/docker-compose.yml index 345104342..dfb1f6a86 100644 --- a/template/express-rest-api/docker-compose.yml +++ b/template/express-rest-api/docker-compose.yml @@ -2,7 +2,7 @@ version: '3.7' services: app: - image: ${BUILDKITE_PLUGIN_DOCKER_IMAGE} + image: ${BUILDKITE_PLUGIN_DOCKER_IMAGE:-''} init: true volumes: - ./:/workdir diff --git a/template/greeter/docker-compose.yml b/template/greeter/docker-compose.yml index 345104342..dfb1f6a86 100644 --- a/template/greeter/docker-compose.yml +++ b/template/greeter/docker-compose.yml @@ -2,7 +2,7 @@ version: '3.7' services: app: - image: ${BUILDKITE_PLUGIN_DOCKER_IMAGE} + image: ${BUILDKITE_PLUGIN_DOCKER_IMAGE:-''} init: true volumes: - ./:/workdir diff --git a/template/koa-rest-api/docker-compose.yml b/template/koa-rest-api/docker-compose.yml index 345104342..dfb1f6a86 100644 --- a/template/koa-rest-api/docker-compose.yml +++ b/template/koa-rest-api/docker-compose.yml @@ -2,7 +2,7 @@ version: '3.7' services: app: - image: ${BUILDKITE_PLUGIN_DOCKER_IMAGE} + image: ${BUILDKITE_PLUGIN_DOCKER_IMAGE:-''} init: true volumes: - ./:/workdir diff --git a/template/lambda-sqs-worker/docker-compose.yml b/template/lambda-sqs-worker/docker-compose.yml index ff7fd64a5..2339c6e86 100644 --- a/template/lambda-sqs-worker/docker-compose.yml +++ b/template/lambda-sqs-worker/docker-compose.yml @@ -2,11 +2,11 @@ version: '3.7' services: app: - image: ${BUILDKITE_PLUGIN_DOCKER_IMAGE} environment: - BUILDKITE_COMMIT - ENVIRONMENT - VERSION + image: ${BUILDKITE_PLUGIN_DOCKER_IMAGE:-''} init: true volumes: - ./:/workdir