Merge pull request #75 from internet2/PC_IdP-UI

fix remaining healthchecks

Workbench/docker-compose.yml

@@ -354,7 +354,7 @@ services:
     ports:
      - 15672:15672
     healthcheck:
-      test: curl -s 127.0.0.1:15672
+      test: curl -s 127.0.0.1:15672 > /dev/null
       interval: 30s
       timeout: 30s
       retries: 3
@@ -412,7 +412,7 @@ services:
     networks:
       - net
     healthcheck:
-      test: curl -s 127.0.0.1:3306
+      test: curl -s 127.0.0.1:3306 ; res=$$? ; if [[ $$res -ne 1 ]]; then exit 1; fi
       interval: 30s
       timeout: 30s
       retries: 3

Workbench/mq/Dockerfile

@@ -8,6 +8,8 @@ ENV RABBITMQ_PID_FILE=/var/run/rabbitmq/pid
 # Must be on /var/lib/rabbitmq (this is the same place where queues are defined)
 ENV RABBITMQ_INIT_DONE_FILE=/var/lib/rabbitmq/initialization.done
 
+RUN apt-get update && apt-get install -y curl
+
 ENTRYPOINT ["/usr/local/bin/demo-entrypoint.sh"]
 
 CMD ["rabbitmq-server"]

Workbench/wordpress_data/Dockerfile

@@ -1,5 +1,6 @@
 from mariadb:latest
 RUN apt-get update
+RUN apt install curl -y
 #RUN apt-get install wget gcc libmysql++-dev librabbitmq-dev pkg-config libbsd-dev -y
 #ENV MYSQL_RANDOM_ROOT_PASSWORD=true
 ENV MYSQL_ROOT_PASSWORD=54y6RxN7GfC7aes3