Merge pull request #275 from TykTechnologies/v5.5.0

Tyk v5.5.0

Author: davegarvey

deployments/analytics-datadog/docker-compose.yml

@@ -16,7 +16,7 @@ services:
       - .env
 
   tyk-pump-datadog:
-    image: tykio/tyk-pump-docker-pub:${PUMP_VERSION:-v1.10.0}
+    image: tykio/tyk-pump-docker-pub:${PUMP_VERSION:-v1.11.0}
     networks:
       - tyk
     volumes:

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.10.0}
+    image: tykio/tyk-pump-docker-pub:${PUMP_VERSION:-v1.11.0}
     networks:
       - tyk
     volumes:

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.10.0}
+    image: tykio/tyk-pump-docker-pub:${PUMP_VERSION:-v1.11.0}
     networks:
       - tyk
     volumes:

deployments/cicd/Dockerfile

@@ -0,0 +1,11 @@
+FROM jenkins/jenkins:2.319.2
+
+USER root
+
+RUN apt-get update && \
+    curl -O https://packagecloud.io/install/repositories/tyk/tyk-sync/script.deb.sh && \
+    chmod +x script.deb.sh && \
+    ./script.deb.sh && \
+    apt-get install -y tyk-sync=1.5.1
+
+USER jenkins

deployments/cicd/data/jenkins/Jenkinsfile

@@ -14,7 +14,7 @@ pipeline {
                 script {
                     if (fileExists('.tyk.json')) {
                         echo "Deploying from ${env.BRANCH_NAME}"
-                        sh "./tyk-sync sync -d http://tyk2-dashboard:3000 -s ${env.tyk2_dashboard_credentials} -p ."
+                        sh "/opt/tyk-sync/tyk-sync sync -d http://tyk2-dashboard:3000 -s ${env.tyk2_dashboard_credentials} -p ."
                     } else {
                         echo 'No files to deploy'
                     }

deployments/cicd/docker-compose.yml

@@ -1,7 +1,8 @@
 ---
 services:
   jenkins:
-    image: jenkins/jenkins:2.319.2-lts-alpine
+    build: ./deployments/cicd
+    image: tyk-demo-jenkins-tyk-sync:v1.5.1
     ports:
       - 8070:8080
     networks:

deployments/cicd/scripts/dump-tyk.sh

@@ -7,5 +7,5 @@ gitea_tyk_data_repo_path=$(cat .context-data/gitea-tyk-data-repo-path)
 docker run --rm \
   --network tyk-demo_tyk \
   -v $gitea_tyk_data_repo_path:/opt/tyk-sync/data \
-  tykio/tyk-sync:v1.4.3 \
+  tykio/tyk-sync:v1.5.1 \
   dump -d http://tyk-dashboard:3000 -s $dashboard_user_api_credentials -t data

deployments/load-balancer-nginx/bootstrap.sh

@@ -6,13 +6,13 @@ deployment="Load Balancer"
 log_start_deployment
 bootstrap_progress
 
-# log_message "Restart Gateways to load latest certificates"
-# docker restart tyk-demo-tyk-gateway-3-1 tyk-demo-tyk-gateway-4-1 1>/dev/null 2>>logs/bootstrap.log
-# if [ "$?" != 0 ]; then
-#   echo "Error when restart Gateways to load latest certificates"
-#   exit 1
-# fi
-# log_ok
+log_message "Restart Gateways to load latest certificates"
+eval $(generate_docker_compose_command) up -d --no-deps --force-recreate tyk-gateway-3 tyk-gateway-4 1>/dev/null 2>>logs/bootstrap.log
+if [ "$?" != 0 ]; then
+  echo "Error when restart Gateways to load latest certificates"
+  exit 1
+fi
+log_ok
 
 log_message "Restart nginx to reset load balancer"
 docker restart tyk-demo-nginx-1 1>/dev/null 2>>logs/bootstrap.log

deployments/load-balancer-nginx/docker-compose.yml

@@ -1,7 +1,7 @@
 ---
 services:
   tyk-gateway-3:
-    image: tykio/tyk-gateway:${GATEWAY_VERSION:-v5.4.0}
+    image: tykio/tyk-gateway:${GATEWAY_VERSION:-v5.5.0}
     networks:
       - tyk
     environment:
@@ -19,7 +19,7 @@ services:
       - .env
     volumes:
       - ./deployments/tyk/volumes/tyk-gateway/tyk.conf:/opt/tyk-gateway/tyk.conf
-      - ./deployments/tyk/volumes/tyk-gateway/certs:/opt/tyk-gateway/certs
+      - tyk-gateway-certs:/opt/tyk-gateway/certs
       - ./deployments/tyk/volumes/tyk-gateway/middleware:/opt/tyk-gateway/middleware
       - ./deployments/tyk/volumes/tyk-gateway/plugins:/opt/tyk-gateway/plugins
       - ./deployments/tyk/volumes/tyk-gateway/templates/error_401.json:/opt/tyk-gateway/templates/error_401.json
@@ -28,7 +28,7 @@ services:
       - tyk-redis
       - tyk-dashboard
   tyk-gateway-4:
-    image: tykio/tyk-gateway:${GATEWAY_VERSION:-v5.4.0}
+    image: tykio/tyk-gateway:${GATEWAY_VERSION:-v5.5.0}
     networks:
       - tyk
     environment:
@@ -46,7 +46,7 @@ services:
       - .env
     volumes:
       - ./deployments/tyk/volumes/tyk-gateway/tyk.conf:/opt/tyk-gateway/tyk.conf
-      - ./deployments/tyk/volumes/tyk-gateway/certs:/opt/tyk-gateway/certs
+      - tyk-gateway-certs:/opt/tyk-gateway/certs
       - ./deployments/tyk/volumes/tyk-gateway/middleware:/opt/tyk-gateway/middleware
       - ./deployments/tyk/volumes/tyk-gateway/plugins:/opt/tyk-gateway/plugins
       - ./deployments/tyk/volumes/tyk-gateway/templates/error_401.json:/opt/tyk-gateway/templates/error_401.json

deployments/mdcb/docker-compose.yml

@@ -1,7 +1,7 @@
 ---
 services:
   tyk-mdcb:
-    image: tykio/tyk-mdcb-docker:${MDCB_VERSION:-v2.6.0}
+    image: tykio/tyk-mdcb-docker:${MDCB_VERSION:-v2.7.0}
     ports:
       - 9091:9091
     networks:
@@ -15,7 +15,7 @@ services:
       - tyk-redis
       - tyk-mongo
   tyk-worker-gateway:
-    image: tykio/tyk-gateway:${GATEWAY_WORKER_VERSION:-v5.4.0}
+    image: tykio/tyk-gateway:${GATEWAY_WORKER_VERSION:-v5.5.0}
     ports:
       - 8090:8080
     networks:
@@ -28,7 +28,7 @@ services:
       - TYK_GW_OPENTELEMETRY_ENDPOINT=${OPENTELEMETRY_ENDPOINT:-false}
     volumes:
       - ./deployments/mdcb/volumes/tyk-worker-gateway/tyk.conf:/opt/tyk-gateway/tyk.conf
-      - ./deployments/tyk/volumes/tyk-gateway/certs:/opt/tyk-gateway/certs
+      - tyk-gateway-certs:/opt/tyk-gateway/certs
       - ./deployments/tyk/volumes/tyk-gateway/middleware:/opt/tyk-gateway/middleware
       - ./deployments/tyk/volumes/tyk-gateway/plugins:/opt/tyk-gateway/plugins
     depends_on: