Merge pull request #186 from TykTechnologies/final-release-4.3.3

release - 4.3.3 Dashboard and GW - 1.7.0 Pump - TIB v1.3.1 - MDCB 2.1.0
TykTechnologies · Feb 21, 2023 · 54e5592 · 54e5592
2 parents 91311fa + 98b64b0
commit 54e5592
Show file tree

Hide file tree

Showing 9 changed files with 29 additions and 25 deletions.
diff --git a/deployments/analytics-datadog/docker-compose.yml b/deployments/analytics-datadog/docker-compose.yml
@@ -16,7 +16,7 @@ services:
       - .env
 
   tyk-pump-datadog:
-    image: tykio/tyk-pump-docker-pub:${PUMP_VERSION:-v1.4.0}
+    image: tykio/tyk-pump-docker-pub:${PUMP_VERSION:-v1.7.0}
     networks:
       - tyk
     volumes:

diff --git a/deployments/analytics-kibana/docker-compose.yml b/deployments/analytics-kibana/docker-compose.yml
@@ -17,7 +17,7 @@ services:
     volumes:
       - elasticsearch-data:/usr/share/elasticsearch/data
   tyk-pump-elasticsearch:
-    image: tykio/tyk-pump-docker-pub:${PUMP_VERSION:-v1.5.1}
+    image: tykio/tyk-pump-docker-pub:${PUMP_VERSION:-v1.7.0}
     networks:
       - tyk
     volumes:

diff --git a/deployments/analytics-splunk/docker-compose.yml b/deployments/analytics-splunk/docker-compose.yml
@@ -15,7 +15,7 @@ services:
       - splunk-data:/opt/splunk/var
       - splunk-data:/opt/splunk/etc
   tyk-splunk-pump:
-    image: tykio/tyk-pump-docker-pub:${PUMP_VERSION:-v1.5.1}
+    image: tykio/tyk-pump-docker-pub:${PUMP_VERSION:-v1.7.0}
     networks:
       - tyk
     volumes:

diff --git a/deployments/mdcb/docker-compose.yml b/deployments/mdcb/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '3.3'
 services:
   tyk-mdcb:
-    image: tykio/tyk-mdcb-docker:${MDCB_VERSION:-v2.0.3}
+    image: tykio/tyk-mdcb-docker:${MDCB_VERSION:-v2.1.0}
     networks:
       - tyk
     volumes:
@@ -13,7 +13,7 @@ services:
       - tyk-redis
       - tyk-mongo
   tyk-worker-gateway:
-    image: tykio/tyk-gateway:${GATEWAY_WORKER_VERSION:-v4.3.3-rc2}
+    image: tykio/tyk-gateway:${GATEWAY_WORKER_VERSION:-v4.3.3}
     ports:
       - 8090:8080
     networks:

diff --git a/deployments/slo-prometheus-grafana/docker-compose.yml b/deployments/slo-prometheus-grafana/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '3.3'
 services:
   tyk-slo-pump:
-    image: tykio/tyk-pump-docker-pub:${PUMP_VERSION:-v1.7.0-rc1}
+    image: tykio/tyk-pump-docker-pub:${PUMP_VERSION:-v1.7.0}
     ports:
     - 8091:8083
     - 8092:8092

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.3.3-rc1}
+    image: tykio/tyk-dashboard:${DASHBOARD_SSO_VERSION:-v4.3.3}
     ports:
       - 3001:3000
     networks:
@@ -19,7 +19,7 @@ services:
       - tyk-mongo
       - tyk-redis
   tyk-identity-broker:
-    image: tykio/tyk-identity-broker:${TIB_VERSION:-v1.0.0}
+    image: tykio/tyk-identity-broker:${TIB_VERSION:-v1.3.1}
     networks:
       - tyk
     ports:
@@ -34,4 +34,4 @@ services:
     networks:
       - tyk
     volumes:
-      - ./deployments/sso/volumes/ldap-server/users.ldif:/ldap/users.ldif
+      - ./deployments/sso/volumes/ldap-server/users.ldif:/ldap/users.ldif
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.3.3-rc1}
+    image: tykio/tyk-dashboard:${DASHBOARD_VERSION:-v4.3.3}
     ports:
       - 3000:3000
     networks:
@@ -22,7 +22,7 @@ services:
       - tyk-redis
       - tyk-mongo
   tyk-gateway:
-    image: tykio/tyk-gateway:${GATEWAY_VERSION:-v4.3.3-rc2}
+    image: tykio/tyk-gateway:${GATEWAY_VERSION:-v4.3.3}
     ports:
       - 8080:8080
       - 8086:8086
@@ -52,7 +52,7 @@ services:
     depends_on:
       - tyk-redis
   tyk-gateway-2:
-    image: tykio/tyk-gateway:${GATEWAY2_VERSION:-v4.3.3-rc2}
+    image: tykio/tyk-gateway:${GATEWAY2_VERSION:-v4.3.3}
     ports:
       - 8081:8080
     networks:
@@ -71,7 +71,7 @@ services:
       - tyk-redis
       - tyk-gateway
   tyk-pump:
-    image: tykio/tyk-pump-docker-pub:${PUMP_VERSION:-v1.5.1}
+    image: tykio/tyk-pump-docker-pub:${PUMP_VERSION:-v1.7.0}
     ports:
       - 8083:8083
     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.3.3-rc1}
+    image: tykio/tyk-dashboard:${DASHBOARD_VERSION:-v4.3.3}
     ports:
       - 3002:3000
     networks:
@@ -20,7 +20,7 @@ services:
       - tyk2-redis
       - tyk2-mongo
   tyk2-gateway:
-    image: tykio/tyk-gateway:${TYK2_GATEWAY_VERSION:-v4.3.3-rc2}
+    image: tykio/tyk-gateway:${TYK2_GATEWAY_VERSION:-v4.3.3}
     ports:
       - 8085:8080
     networks:
@@ -37,7 +37,7 @@ services:
     depends_on:
       - tyk2-redis
   tyk2-pump:
-    image: tykio/tyk-pump-docker-pub:${TYK2_PUMP_VERSION:-v1.0.0}
+    image: tykio/tyk-pump-docker-pub:${TYK2_PUMP_VERSION:-v1.7.0}
     networks:
       - tyk
     volumes:

diff --git a/scripts/test-all.sh b/scripts/test-all.sh
@@ -87,15 +87,19 @@ do
     echo "Testing deployment: $deployment_name "
     # Provide the 'test' environment variables, so newman can target the correct hosts from within the docker network
     # --insecure option is used due to self-signed certificates
-    docker run -t --rm \
-        --network tyk-demo_tyk \
-        -v $(pwd)/$postman_collection_path:/etc/postman/tyk_demo.postman_collection.json \
-        -v $(pwd)/test.postman_environment.json:/etc/postman/test.postman_environment.json \
-        postman/newman:alpine \
-        run "/etc/postman/tyk_demo.postman_collection.json" \
-        --environment /etc/postman/test.postman_environment.json \
-        --insecure \
-        | tee -a test.log
+    # pipefail option is set so that failure of docker command can be detected
+    (
+        set -o pipefail  
+        docker run -t --rm \
+            --network tyk-demo_tyk \
+            -v $(pwd)/$postman_collection_path:/etc/postman/tyk_demo.postman_collection.json \
+            -v $(pwd)/test.postman_environment.json:/etc/postman/test.postman_environment.json \
+            postman/newman:alpine \
+            run "/etc/postman/tyk_demo.postman_collection.json" \
+            --environment /etc/postman/test.postman_environment.json \
+            --insecure \
+            | tee -a test.log
+    )
     # output of above command is captured in test.log file
     # file will contain control characters, so is advised to use command "less -r test.log", or similar, to view it