Mercurial > hg > thermostat-ng > web-gateway

changeset 153:de6a3c5c2321

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix build setup of Keycloak Docker image Reviewed-by: jerboaa Review-thread: http://icedtea.classpath.org/pipermail/thermostat/2017-May/023192.html
author Jie Kang <jkang@redhat.com>
date Thu, 18 May 2017 11:33:18 -0400
parents 428032cdc6fc
children b1bdc9e324c3
files docker/thermostat-keycloak/Dockerfile docker/thermostat-keycloak/README.md docker/thermostat-keycloak/setup-keycloak.sh
diffstat 3 files changed, 19 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/docker/thermostat-keycloak/Dockerfile	Tue May 16 11:52:33 2017 -0400
+++ b/docker/thermostat-keycloak/Dockerfile	Thu May 18 11:33:18 2017 -0400
@@ -1,4 +1,4 @@
-FROM jboss/keycloak
+FROM jboss/keycloak:3.0.0.Final
 
 COPY setup-keycloak.sh /opt/jboss/setup-keycloak.sh
 RUN /opt/jboss/setup-keycloak.sh
--- a/docker/thermostat-keycloak/README.md	Tue May 16 11:52:33 2017 -0400
+++ b/docker/thermostat-keycloak/README.md	Thu May 18 11:33:18 2017 -0400
@@ -5,13 +5,13 @@
 ## Build image
 
 ```
-$ docker build -t thermostat-keycloak .
+$ docker build --rm -t thermostat-keycloak .
 ```
 
 ## Run container
 
 ```
-$ docker run --name thermostat-keycloak thermostat-keycloak
+$ docker run thermostat-keycloak
 ```
 
 ## Settings
--- a/docker/thermostat-keycloak/setup-keycloak.sh	Tue May 16 11:52:33 2017 -0400
+++ b/docker/thermostat-keycloak/setup-keycloak.sh	Thu May 18 11:33:18 2017 -0400
@@ -41,7 +41,7 @@
 THERMOSTAT_PASSWORD=tms-pass
 REALM=thermostat
 
-SERVER=http://localhost:8080/auth
+SERVER=http://127.0.0.1:8080/auth
 CLI=keycloak/bin/kcadm.sh
 
 keycloak/bin/add-user-keycloak.sh --user ${KEYCLOAK_ADMIN} --password ${KEYCLOAK_ADMIN}
@@ -49,7 +49,22 @@
 keycloak/bin/standalone.sh & >/dev/null 2&>1
 
 # Wait for keycloak to startup
+HOST=127.0.0.1
+PORT=8080
+RETRIES=25
+
 sleep 10
+until curl -f -v "http://${HOST}:${PORT}/auth" >/dev/null 2>/dev/null
+do
+    RETRIES=$(($RETRIES - 1))
+    if [ $RETRIES -eq 0 ]
+    then
+        echo "Failed to connect"
+        exit 1
+    fi
+    sleep 2
+done
+echo
 
 ${CLI} config credentials --server ${SERVER} --realm master --user ${KEYCLOAK_ADMIN} --password ${KEYCLOAK_ADMIN}