From 39cda6e6b4f4f5b6f6da7011bf04f99fa7e57912 Mon Sep 17 00:00:00 2001
From: Zaid Albirawi <zaid@tyk.io>
Date: Tue, 13 Aug 2024 14:52:56 -0400
Subject: [PATCH 1/3] Update Readme and move up.sh to scripts/init.sh

---
 README.md                | 8 +++-----
 up.sh => scripts/init.sh | 2 +-
 2 files changed, 4 insertions(+), 6 deletions(-)
 rename up.sh => scripts/init.sh (99%)

diff --git a/README.md b/README.md
index 52626cc..44209f5 100644
--- a/README.md
+++ b/README.md
@@ -12,15 +12,13 @@
 
 1. Close the repo: `git clone https://github.com/TykTechnologies/tyk-pro-docker-demo && cd tyk-pro-docker-demo`
 
-2. For a bootstrapped install, run `up.sh`
-OR
-2. Add your Tyk Dashboard license to .env (see .env.example) and run `docker-compose up`
+2. Run `docker-compose up` to start your instance.
 
+*** To bootstrap your instance, run ./scripts/init.sh - you can skip this if you'd like to bootstrap the instance manually. However, you will need to create a .env file and add the license to it. You can use the `.env.example` for reference.
 **gotcha:** you may need to give the executable permissions if you have an error:
 `chmod +x up.sh`
 
-
-4. The script sends to the STDOUT the details you need to open and log in to Tyk Dashobard:
+3. The script sends to the STDOUT the details you need to open and log in to Tyk Dashobard:
 ```
 ---------------------------
 Please sign in at http://localhost:3000
diff --git a/up.sh b/scripts/init.sh
similarity index 99%
rename from up.sh
rename to scripts/init.sh
index 3dbf1d5..2825460 100755
--- a/up.sh
+++ b/scripts/init.sh
@@ -19,7 +19,7 @@ else
 fi
 
 echo "Bringing Tyk Trial deployment UP..."
-docker-compose up -d
+docker compose up -d
 if [ $? -ne 0 ]; then
     echo "docker-compose up failed"
     exit 1

From dc7f31efc5c34d9c427dde8d9a047838f0921d9a Mon Sep 17 00:00:00 2001
From: Zaid Albirawi <zaid@tyk.io>
Date: Tue, 13 Aug 2024 14:56:02 -0400
Subject: [PATCH 2/3] Update init.sh

---
 scripts/init.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/init.sh b/scripts/init.sh
index 2825460..3dbf1d5 100755
--- a/scripts/init.sh
+++ b/scripts/init.sh
@@ -19,7 +19,7 @@ else
 fi
 
 echo "Bringing Tyk Trial deployment UP..."
-docker compose up -d
+docker-compose up -d
 if [ $? -ne 0 ]; then
     echo "docker-compose up failed"
     exit 1

From ef625a542335a5eb2c48fd52844b75da790cf69c Mon Sep 17 00:00:00 2001
From: Zaid Albirawi <zaid@tyk.io>
Date: Tue, 13 Aug 2024 15:07:12 -0400
Subject: [PATCH 3/3] Update versions

---
 .env.example       | 7 ++++---
 docker-compose.yml | 8 ++++----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/.env.example b/.env.example
index b6286ea..9a06cfa 100644
--- a/.env.example
+++ b/.env.example
@@ -1,4 +1,5 @@
 DASH_LICENSE=eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJhbGxvd2VkX25vZGVzIjoiYTczYzA2ZjMtOWFlZC00MTc0LTRlMzEtMThhNDY5MDM4NzM2LDBkZWZkZjk3LTNiYmUtNGViNi01MDhlLWIyNjY3M2M2OGU5YSw1ZTI3NzM4NC02NDFjLTQzNmQtNmRhZC03MzViZmZjZmI0ZWMsMzY3ODA1YWYtMGU2NC00MTZjLTVhNzMtNTgxNWQ3YjRiM2U1LDcyMTE0ZWJjLTAwZmYtNDIyMi03ZmQwLWM0MWIzY2JlZmE5ZSw2ZTAzZjFiNS0xZmNjLTQzYjQtNjgwMC1iY2VhNGQwOTIxMGMsOTZkOTk4ZjctNDZjOS00ZjVjLTUzYjAtYjYzY2ZmOWU5Nzg3LGI3ODI4MGZjLWZlOGUtNDA4Ny02M2I1LTljMTVlYTM5YjcyNCwwM2ZkYWE2ZS1mMjgyLTQ2ZWEtNjNlNy03YzNmZjk3NjE3MjQsMjc2N2U0YzItZTdiOS00YWVlLTczNWEtNTkyN2ZlNzMyNjBlIiwiZXhwIjoxNzIyNDcwMzk5LCJpYXQiOjE3MTk4MjY5OTIsIm93bmVyIjoiNjFjY2U2MmMxMjFjYTEwMDAxOGJiMTkwIiwic2NvcGUiOiJtdWx0aV90ZWFtLHJiYWMsZ3JhcGgsZmVkZXJhdGlvbiIsInYiOiIyIn0.OfiJxeCO9JNHSMqqesNrX5dkZRT6TIYKGxALp8Hv1PYfUFLq0X4HBJaZOcXrhoohGb5p3kZbBuPiKcqxX8twQVUVERx1mqWuJdhBCOjSls-uQXnkjHPbkzKVQotmtqNPrmWoAYAQ6Po4vAxXwSVsRHK5-fOVXf_QeTX7Wi2qPcbnF6uqLTS7I3QXOMox7UGCn2F1u1Tisyhb1jEitLjvvz_eiH_4uZ1mOL32L6vOUK4whxX2XsoGkLOK-v68FVXiSr-LitqA1fCAi2pq5-5vhggqgwZcdWL2uWHfrhfzg3vh_9TN9Su0oo45dkSpL2WHUoRCOWbs8du2sn2Fm_EuzA
-GATEWAY_VERSION="v5.4.0"
-PORTAL_VERSION="v1.10.0"
-DASHBOARD_VERSION="v5.4.0"
+DASHBOARD_VERSION="v5.5"
+GATEWAY_VERSION="v5.5"
+PORTAL_VERSION="v1.10"
+PUMP_VERSION="v1.11"
diff --git a/docker-compose.yml b/docker-compose.yml
index 60de057..1af8af6 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '3.9'
 services:
   tyk-dashboard:
-    image: tykio/tyk-dashboard:${DASHBOARD_VERSION:-v5.4.0}
+    image: tykio/tyk-dashboard:${DASHBOARD_VERSION:-v5.5}
     container_name: tyk-dashboard
     environment:
       - TYK_DB_LICENSEKEY=${DASH_LICENSE:?License key missing from Docker environment file "".env" file.  Review The Getting Started steps in README.md.}
@@ -17,7 +17,7 @@ services:
     networks:
       - tyk
   tyk-ent-portal:
-    image: tykio/portal:${PORTAL_VERSION:-v1.10.0}
+    image: tykio/portal:${PORTAL_VERSION:-v1.10}
     command: --bootstrap
     ports:
       - 3001:3001
@@ -29,7 +29,7 @@ services:
       - tyk
 
   tyk-gateway:
-    image: tykio/tyk-gateway:${GATEWAY_VERSION:-v5.4.0}
+    image: tykio/tyk-gateway:${GATEWAY_VERSION:-v5.5}
     container_name: tyk-gateway
     ports:
       - "8080:8080"
@@ -39,7 +39,7 @@ services:
       - tyk
 
   tyk-pump:
-    image: tykio/tyk-pump-docker-pub:v1.10.0
+    image: tykio/tyk-pump-docker-pub:${PUMP_VERSION:-v1.11}
     container_name: tyk-pump
     env_file:
       - ./confs/pump.env