crossdock fix (wait for nginx proxy that waits for collector)

Signed-off-by: Iori YONEJI <fivo.11235813@gmail.com>
jaegertracing · Mar 12, 2019 · 9479bb3 · 9479bb3
1 parent 9892e8d
commit 9479bb3
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/jaeger-crossdock/docker-compose.yml b/jaeger-crossdock/docker-compose.yml
@@ -12,7 +12,7 @@ services:
             - python
             - nodejs
         environment:
-            - WAIT_FOR=test_driver,go,java-udp,java-http,java-https,python,nodejs
+            - WAIT_FOR=test_driver,go,java-udp,java-http,java-https,python,nodejs,jaeger-collector-https-proxy
             - WAIT_FOR_TIMEOUT=60s
 
             - CALL_TIMEOUT=60s
@@ -76,8 +76,9 @@ services:
             - jaeger-collector
 
     jaeger-collector-https-proxy:
-        image: nginx
+        image: nginx:alpine
         ports:
+            - "8080:8080"
             - "14443:14443"
         volumes:
             - ./https-proxy/build/proxy.conf:/etc/nginx/conf.d/proxy.conf
@@ -86,7 +87,7 @@ services:
         restart: on-failure
         depends_on:
             - jaeger-collector
-        command: ["nginx", "-g", "daemon off;"]
+        command: ["sh", "-c", "while ! { wget --spider -S http://jaeger-collector:14269; }; do echo waiting...; sleep 10; done; nginx -g 'daemon off;'"]
 
     test_driver:
         image: jaegertracing/test-driver

diff --git a/jaeger-crossdock/https-proxy/proxy.template.conf b/jaeger-crossdock/https-proxy/proxy.template.conf
@@ -1,3 +1,12 @@
+server {
+    listen 8080;
+    server_name ${SERVER};
+    location / {
+        root /usr/share/nginx/html/;
+				index index.html;
+    }
+}
+
 server {
     listen 14443 ssl;
     server_name ${SERVER};