From 1ee07ae11696df8646229876334691889e662989 Mon Sep 17 00:00:00 2001
From: carlostyk <101631546+carlostyk@users.noreply.github.com>
Date: Tue, 21 Feb 2023 08:50:25 +0100
Subject: [PATCH 01/10] Update GW and MDCB versions

---
 deployments/mdcb/docker-compose.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/deployments/mdcb/docker-compose.yml b/deployments/mdcb/docker-compose.yml
index 8fc2d1a5..367851d1 100644
--- 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:

From c166a49e26d3fd784bb6dcbc3166aeb14b34ef0d Mon Sep 17 00:00:00 2001
From: carlostyk <101631546+carlostyk@users.noreply.github.com>
Date: Tue, 21 Feb 2023 08:52:56 +0100
Subject: [PATCH 02/10] Updated Dashboard to 4.3.3 and TIB to v1.3.1

---
 deployments/sso/docker-compose.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/deployments/sso/docker-compose.yml b/deployments/sso/docker-compose.yml
index 1ae31efe..72f26868 100644
--- 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
\ No newline at end of file
+      - ./deployments/sso/volumes/ldap-server/users.ldif:/ldap/users.ldif

From 37967935b4b03f95037ddfa8d93a9c6a1d2fa2a6 Mon Sep 17 00:00:00 2001
From: carlostyk <101631546+carlostyk@users.noreply.github.com>
Date: Tue, 21 Feb 2023 08:55:20 +0100
Subject: [PATCH 03/10] Updated GW Dashboard and Pump to latests versions

---
 deployments/tyk/docker-compose.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/deployments/tyk/docker-compose.yml b/deployments/tyk/docker-compose.yml
index 48d95338..f8768e57 100755
--- 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:

From db08a397876d637307d8f38bce429cfb54baf998 Mon Sep 17 00:00:00 2001
From: carlostyk <101631546+carlostyk@users.noreply.github.com>
Date: Tue, 21 Feb 2023 08:56:18 +0100
Subject: [PATCH 04/10] Updated GW Dashboard Pump to latest versions

---
 deployments/tyk2/docker-compose.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/deployments/tyk2/docker-compose.yml b/deployments/tyk2/docker-compose.yml
index 52111ad7..7132e1a5 100644
--- 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.3.0}
     networks:
       - tyk
     volumes:

From 6e8bbc2243ed758624f41b07b5686aee23962cdb Mon Sep 17 00:00:00 2001
From: carlostyk <101631546+carlostyk@users.noreply.github.com>
Date: Tue, 21 Feb 2023 12:07:15 +0100
Subject: [PATCH 05/10] Pump to v1.7.0

---
 deployments/tyk2/docker-compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deployments/tyk2/docker-compose.yml b/deployments/tyk2/docker-compose.yml
index 7132e1a5..9c354067 100644
--- a/deployments/tyk2/docker-compose.yml
+++ b/deployments/tyk2/docker-compose.yml
@@ -37,7 +37,7 @@ services:
     depends_on:
       - tyk2-redis
   tyk2-pump:
-    image: tykio/tyk-pump-docker-pub:${TYK2_PUMP_VERSION:-v1.3.0}
+    image: tykio/tyk-pump-docker-pub:${TYK2_PUMP_VERSION:-v1.7.0}
     networks:
       - tyk
     volumes:

From e11816e9f93a09d63b288683c571c7e823d779ab Mon Sep 17 00:00:00 2001
From: carlostyk <101631546+carlostyk@users.noreply.github.com>
Date: Tue, 21 Feb 2023 12:07:44 +0100
Subject: [PATCH 06/10] Update docker-compose.yml

---
 deployments/analytics-datadog/docker-compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deployments/analytics-datadog/docker-compose.yml b/deployments/analytics-datadog/docker-compose.yml
index 252fcd92..78b6d581 100644
--- 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:

From f01dfdba62da99af38c434a1006782854b5d17b8 Mon Sep 17 00:00:00 2001
From: carlostyk <101631546+carlostyk@users.noreply.github.com>
Date: Tue, 21 Feb 2023 12:08:40 +0100
Subject: [PATCH 07/10] Pump to latest v1.7.0

---
 deployments/analytics-kibana/docker-compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deployments/analytics-kibana/docker-compose.yml b/deployments/analytics-kibana/docker-compose.yml
index 889bbd82..e507f6cb 100644
--- 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:

From 6968212a422d95f667620981b0ea360461d1b35f Mon Sep 17 00:00:00 2001
From: carlostyk <101631546+carlostyk@users.noreply.github.com>
Date: Tue, 21 Feb 2023 12:09:18 +0100
Subject: [PATCH 08/10] Pump to v1.7.0

---
 deployments/analytics-splunk/docker-compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deployments/analytics-splunk/docker-compose.yml b/deployments/analytics-splunk/docker-compose.yml
index 2bab2eed..28d65ca4 100644
--- 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:

From a3ed5dc1a5dd69879f40c8dc8268e6983d04e264 Mon Sep 17 00:00:00 2001
From: David Garvey <davegarvey@hotmail.com>
Date: Tue, 21 Feb 2023 13:32:52 +0100
Subject: [PATCH 09/10] bump version from rc to full

---
 deployments/slo-prometheus-grafana/docker-compose.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/deployments/slo-prometheus-grafana/docker-compose.yml b/deployments/slo-prometheus-grafana/docker-compose.yml
index 6162cde5..65550fcb 100755
--- 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

From 98b64b0a523f5d4358863775e2a2ea8cd5cb991e Mon Sep 17 00:00:00 2001
From: David Garvey <davegarvey@hotmail.com>
Date: Tue, 21 Feb 2023 14:11:04 +0100
Subject: [PATCH 10/10] fix exit code masking issue

---
 scripts/test-all.sh | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/scripts/test-all.sh b/scripts/test-all.sh
index b81c790e..03475d0a 100755
--- 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