michael-k · March 7, 2017 18:22 · Nov 30, 2016 · Nov 29, 2016 · Nov 25, 2016 · Nov 25, 2016
diff --git a/Makefile b/Makefile
@@ -1,12 +1,10 @@
 # Service health functions
 # Syntax: $(call check_service_health,<docker-compose-environment>,<service-name>)
 get_container_id = $$(docker-compose $(1) ps -q $(2))
-get_container_state = $$(echo $(call get_container_id,$(1),$(2)) | xargs -I ID docker inspect -f '{{ $(3) }}' ID)
-get_service_health = $$(echo $(call get_container_state,$(1),$(2),.State.Health.Status))
-get_service_running = $$(echo $(call get_container_state,$(1),$(2),.State.Running))
+get_container_state = $$(echo $(call get_container_id,$(1),$(2)) | xargs -I ID docker inspect -f '$(3)' ID)
+get_service_health = $$(echo $(call get_container_state,$(1),$(2),{{if .State.Running}}{{ .State.Health.Status }}{{end}}))
 check_service_health = { \
-  until [[ $(call get_service_health,$(1),$(2)) != starting ]] \
-        || ($(call get_service_running,$(1),$(2)) = false) ]]; \
+  until [[ $(call get_service_health,$(1),$(2)) != starting ]]; \
     do sleep 1; \
   done; \
   if [[ $(call get_service_health,$(1),$(2)) != healthy ]]; \

diff --git a/Makefile b/Makefile
@@ -1,9 +1,12 @@
 # Service health functions
 # Syntax: $(call check_service_health,<docker-compose-environment>,<service-name>)
 get_container_id = $$(docker-compose $(1) ps -q $(2))
-get_service_health = $$(echo $(call get_container_id,$(1),$(2)) | xargs -I ID docker inspect -f '{{ .State.Health.Status }}' ID)
+get_container_state = $$(echo $(call get_container_id,$(1),$(2)) | xargs -I ID docker inspect -f '{{ $(3) }}' ID)
+get_service_health = $$(echo $(call get_container_state,$(1),$(2),.State.Health.Status))
+get_service_running = $$(echo $(call get_container_state,$(1),$(2),.State.Running))
 check_service_health = { \
-  until [[ $(call get_service_health,$(1),$(2)) != starting ]]; \
+  until [[ $(call get_service_health,$(1),$(2)) != starting ]] \
+        || ($(call get_service_running,$(1),$(2)) = false) ]]; \
     do sleep 1; \
   done; \
   if [[ $(call get_service_health,$(1),$(2)) != healthy ]]; \

diff --git a/Makefile b/Makefile
@@ -14,10 +14,10 @@ check_service_health = { \
 # $(RELEASE_ARGS) represents the '-p <project> -f <docker-compose-file>' portion of docker-compose command
 release:
   # Start mysql container
-  @ docker-compose up $(RELEASE_ARGS) mysql -d
+  @ docker-compose $(RELEASE_ARGS) up -d mysql
   # This will wait until mysql container health changes from starting to healthy or unhealthy
   @ $(call check_service_health,$(RELEASE_ARGS),mysql)
   # Start nginx container
-  @ docker-compose up $(RELEASE_ARGS) nginx -d
+  @ docker-compose $(RELEASE_ARGS) up -d nginx
   # This will wait until nginx container health changes from starting to healthy or unhealthy
   @ $(call check_service_health,$(RELEASE_ARGS),nginx)
diff --git a/Dockerfile.mysql b/Dockerfile.mysql
@@ -0,0 +1,2 @@
+FROM mysql:5.7
+HEALTHCHECK --interval=3s --retries=20 CMD mysqlshow -u ${MYSQL_USER} -p${MYSQL_PASSWORD}
diff --git a/Makefile b/Makefile
@@ -13,5 +13,11 @@ check_service_health = { \
 
 # $(RELEASE_ARGS) represents the '-p <project> -f <docker-compose-file>' portion of docker-compose command
 release:
-  # This will wait until container health changes from starting to healthy or unhealthy
+  # Start mysql container
+  @ docker-compose up $(RELEASE_ARGS) mysql -d
+  # This will wait until mysql container health changes from starting to healthy or unhealthy
+  @ $(call check_service_health,$(RELEASE_ARGS),mysql)
+  # Start nginx container
+  @ docker-compose up $(RELEASE_ARGS) nginx -d
+  # This will wait until nginx container health changes from starting to healthy or unhealthy
   @ $(call check_service_health,$(RELEASE_ARGS),nginx)
diff --git a/Dockerfile b/Dockerfile
@@ -0,0 +1,2 @@
+FROM nginx
+HEALTHCHECK --interval=3s --retries=20 CMD curl -fs http://localhost:${HTTP_PORT:-8000}
diff --git a/Makefile b/Makefile
@@ -0,0 +1,17 @@
+# Service health functions
+# Syntax: $(call check_service_health,<docker-compose-environment>,<service-name>)
+get_container_id = $$(docker-compose $(1) ps -q $(2))
+get_service_health = $$(echo $(call get_container_id,$(1),$(2)) | xargs -I ID docker inspect -f '{{ .State.Health.Status }}' ID)
+check_service_health = { \
+  until [[ $(call get_service_health,$(1),$(2)) != starting ]]; \
+    do sleep 1; \
+  done; \
+  if [[ $(call get_service_health,$(1),$(2)) != healthy ]]; \
+    then echo $(2) failed health check; exit 1; \
+  fi; \
+}
+
+# $(RELEASE_ARGS) represents the '-p <project> -f <docker-compose-file>' portion of docker-compose command
+release:
+  # This will wait until container health changes from starting to healthy or unhealthy
+  @ $(call check_service_health,$(RELEASE_ARGS),nginx)
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		FROM mysql:5.7
		HEALTHCHECK --interval=3s --retries=20 CMD mysqlshow -u ${MYSQL_USER} -p${MYSQL_PASSWORD}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		FROM nginx
		HEALTHCHECK --interval=3s --retries=20 CMD curl -fs http://localhost:${HTTP_PORT:-8000}