Merge branch 'master' into yarn-deduplicate

seek-oss · Jul 8, 2021 · 7817782 · 7817782
2 parents 6b1fa0d + ee44447
commit 7817782
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 4 deletions.
diff --git a/.changeset/rich-crabs-end.md 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
@@ -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
@@ -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
@@ -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
@@ -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