Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Readme and move up.sh to scripts/init.sh #70

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions .env.example
Original file line number Diff line number Diff line change
@@ -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"
8 changes: 3 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -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.}
Expand All @@ -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
Expand All @@ -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"
Expand All @@ -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
Expand Down
File renamed without changes.