Merge pull request #140 from envato/fix-bug-with-hyphens-in-services

Fix bug with hyphens in service names

lib/push.bash

@@ -5,7 +5,7 @@ compose_image_for_service() {
   local image=""
 
   image=$(run_docker_compose config \
-    | grep -E "^(  \\w+:|    image:)" \
+    | grep -E "^(  [_[:alnum:]-]+:|    image:)" \
     | grep -E "(  ${service}:)" -A 1 \
     | grep -oE '  image: (.+)' \
     | awk '{print $2}')

tests/composefiles/docker-compose.config.with.hyphens.yml

@@ -0,0 +1,8 @@
+version: '3.2'
+services:
+  app:
+    build: ../..
+    depends_on:
+      - foo-db
+  foo-db:
+    image: postgres:9.4

tests/docker-compose-images.bats

@@ -18,6 +18,18 @@ load '../lib/push'
   unstub docker-compose
 }
 
+@test "Image for compose service with a service with hyphens in the name" {
+  export HIDE_PROMPT=1
+  stub docker-compose \
+    "-f docker-compose.yml -p buildkite config : cat $PWD/tests/composefiles/docker-compose.config.with.hyphens.yml"
+
+  run compose_image_for_service "app"
+
+  assert_success
+  assert_output "buildkite_app"
+  unstub docker-compose
+}
+
 @test "Image for compose service without an image in config" {
   export HIDE_PROMPT=1
   stub docker-compose \
@@ -28,4 +40,4 @@ load '../lib/push'
   assert_success
   assert_output "buildkite_helper"
   unstub docker-compose
-}
+}