Merge pull request #568 from gitlabhq/fix-license-file

Fix EE test mounting license as a directory

Author: armsnyder

docker-compose.yml

@@ -16,7 +16,7 @@ services:
       - config-ce:/etc/gitlab
       - logs-ce:/var/log/gitlab
       - data-ce:/var/opt/gitlab
-      - ./scripts/healthcheck-and-setup.sh:/healthcheck-and-setup.sh
+      - ${PWD}/scripts/healthcheck-and-setup.sh:/healthcheck-and-setup.sh
     healthcheck:
       test: /healthcheck-and-setup.sh
       interval: 10s
@@ -36,8 +36,8 @@ services:
       - config-ee:/etc/gitlab
       - logs-ee:/var/log/gitlab
       - data-ee:/var/opt/gitlab
-      - ./scripts/healthcheck-and-setup.sh:/healthcheck-and-setup.sh
-      - ./Gitlab-license.txt:/Gitlab-license.txt
+      - ${PWD}/scripts/healthcheck-and-setup.sh:/healthcheck-and-setup.sh
+      - ${PWD}/Gitlab-license.txt:/Gitlab-license.txt
     healthcheck:
       test: /healthcheck-and-setup.sh
       interval: 10s

scripts/await-healthy.sh

@@ -1,10 +1,15 @@
 #!/usr/bin/env sh
 
-echo 'Waiting for GitLab container to become healthy'
+printf 'Waiting for GitLab container to become healthy'
 
 until test -n "$(docker ps --quiet --filter label=terraform-provider-gitlab/owned --filter health=healthy)"; do
   printf '.'
   sleep 5
 done
 
+echo
 echo 'GitLab is healthy'
+
+# Print the version, since it is useful debugging information.
+curl --silent --show-error --header 'PRIVATE-TOKEN: ACCTEST' http://127.0.0.1:8080/api/v4/version
+echo