Merge pull request #176 from TykTechnologies/r4.2

R4.2
TykTechnologies · Sep 14, 2022 · 0f90228 · 0f90228
2 parents 4be0cd0 + 1037f96
commit 0f90228
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 17 deletions.
diff --git a/deployments/mdcb/docker-compose.yml b/deployments/mdcb/docker-compose.yml
@@ -13,7 +13,7 @@ services:
       - tyk-redis
       - tyk-mongo
   tyk-worker-gateway:
-    image: tykio/tyk-gateway:${GATEWAY_WORKER_VERSION:-v4.1.0}
+    image: tykio/tyk-gateway:${GATEWAY_WORKER_VERSION:-v4.2.0}
     ports:
       - 8084:8080
     networks:

diff --git a/deployments/sso/docker-compose.yml b/deployments/sso/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '3.3'
 services:
   tyk-dashboard-sso:
-    image: tykio/tyk-dashboard:${DASHBOARD_SSO_VERSION:-v4.1.0}
+    image: tykio/tyk-dashboard:${DASHBOARD_SSO_VERSION:-v4.2.0}
     ports:
       - 3001:3000
     networks:

diff --git a/deployments/tyk/bootstrap.sh b/deployments/tyk/bootstrap.sh
@@ -472,25 +472,21 @@ fi
 log_ok
 bootstrap_progress
 
-log_message "Deploying ngrok for "
+log_message "Getting ngrok public URL for Tyk Gateway"
 ngrok_dashboard_url="http://localhost:4040"
 ngrok_ip_api_endpoint="$ngrok_dashboard_url/api/tunnels"
-
-log_message "Getting the ngrok allocated IP for tyk-gateway:8080"
-
+log_message "  Getting data from $ngrok_ip_api_endpoint"
 ngrok_public_url=$(curl --fail --silent --show-error ${ngrok_ip_api_endpoint} | jq ".tunnels[0].public_url" --raw-output)
-
 if [ "$?" != 0 ]; then
-  echo "Error occurred with ngrok."
-  echo "access_ip=" $ngrok_public_url
+  echo "Error getting ngrok configuration from $ngrok_ip_api_endpoint"
   exit 1
 fi
-
 if [ "$ngrok_public_url" = "" ]; then
-  echo "Error occurred with ngrok."
-  echo "access_ip=" $ngrok_public_url
+  echo "Error: ngrok public URL is empty"
   exit 1
 fi
+log_message "  Ngrok public URL: $ngrok_public_url"
+log_ok
 
 log_end_deployment
 

diff --git a/deployments/tyk/docker-compose.yml b/deployments/tyk/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '3.8'
 services:
   tyk-dashboard:
-    image: tykio/tyk-dashboard:${DASHBOARD_VERSION:-v4.1.0}
+    image: tykio/tyk-dashboard:${DASHBOARD_VERSION:-v4.2.0}
     ports:
       - 3000:3000
     networks:
@@ -22,7 +22,7 @@ services:
       - tyk-redis
       - tyk-mongo
   tyk-gateway:
-    image: tykio/tyk-gateway:${GATEWAY_VERSION:-v4.1.0}
+    image: tykio/tyk-gateway:${GATEWAY_VERSION:-v4.2.0}
     ports:
       - 8080:8080
       - 8086:8086
@@ -52,7 +52,7 @@ services:
     depends_on:
       - tyk-redis
   tyk-gateway-2:
-    image: tykio/tyk-gateway:${GATEWAY2_VERSION:-v4.1.0}
+    image: tykio/tyk-gateway:${GATEWAY2_VERSION:-v4.2.0}
     ports:
       - 8081:8080
     networks:

diff --git a/deployments/tyk2/docker-compose.yml b/deployments/tyk2/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '3.3'
 services:
   tyk2-dashboard:
-    image: tykio/tyk-dashboard:${DASHBOARD_VERSION:-v4.1.0}
+    image: tykio/tyk-dashboard:${DASHBOARD_VERSION:-v4.2.0}
     ports:
       - 3002:3000
     networks:
@@ -20,7 +20,7 @@ services:
       - tyk2-redis
       - tyk2-mongo
   tyk2-gateway:
-    image: tykio/tyk-gateway:${TYK2_GATEWAY_VERSION:-v4.1.0}
+    image: tykio/tyk-gateway:${TYK2_GATEWAY_VERSION:-v4.2.0}
     ports:
       - 8085:8080
     networks: