diff --git a/deployments/analytics-datadog/docker-compose.yml b/deployments/analytics-datadog/docker-compose.yml index 8c200e91..78289526 100644 --- a/deployments/analytics-datadog/docker-compose.yml +++ b/deployments/analytics-datadog/docker-compose.yml @@ -1,5 +1,4 @@ --- -version: '3.3' services: dd-agent: image: gcr.io/datadoghq/agent:latest diff --git a/deployments/analytics-kibana/docker-compose.yml b/deployments/analytics-kibana/docker-compose.yml index 86e0c789..29256653 100644 --- a/deployments/analytics-kibana/docker-compose.yml +++ b/deployments/analytics-kibana/docker-compose.yml @@ -1,5 +1,4 @@ --- -version: '3.3' services: kibana: image: docker.elastic.co/kibana/kibana:7.17.1 diff --git a/deployments/analytics-splunk/docker-compose.yml b/deployments/analytics-splunk/docker-compose.yml index 7a125672..1e3709a3 100644 --- a/deployments/analytics-splunk/docker-compose.yml +++ b/deployments/analytics-splunk/docker-compose.yml @@ -1,5 +1,4 @@ --- -version: '3.3' services: tyk-splunk: image: splunk/splunk:latest diff --git a/deployments/backstage/bootstrap.sh b/deployments/backstage/bootstrap.sh new file mode 100755 index 00000000..6eaf8f22 --- /dev/null +++ b/deployments/backstage/bootstrap.sh @@ -0,0 +1,25 @@ +#!/bin/bash + +source scripts/common.sh +deployment="Backstage" + +log_start_deployment +bootstrap_progress + +dashboard_base_url="http://tyk-dashboard.localhost:3000" +dashboard_api_key=$(get_context_data "1" "dashboard-user" "1" "api-key") +dashboard_admin_api_credentials=$(cat deployments/tyk/volumes/tyk-dashboard/tyk_analytics.conf | jq -r .admin_secret 2>> logs/bootstrap.log) + +# this assumes that the backstage backend is available on the host machine on port 7007, and that it has the tyk entitiy provider installed +log_message "Adding API event webhook to default organisation" +updated_org_data=$(jq '.event_options += { "api_event": { "webhook": "http://host.docker.internal:7007/api/catalog/tyk/development/sync" } }' < deployments/tyk/data/tyk-dashboard/1/organisation.json) +api_response=$(curl $dashboard_base_url/admin/organisations/5e9d9544a1dcd60001d0ed20 --request PUT -s \ + -H "admin-auth: $dashboard_admin_api_credentials" \ + -d "$updated_org_data" 2>> logs/bootstrap.log) +log_json_result "$api_response" + +bootstrap_progress +log_end_deployment + +# blank output to overwrite "bootstrapping..." message +echo -e "\033[2K " diff --git a/deployments/backstage/docker-compose.yml b/deployments/backstage/docker-compose.yml new file mode 100644 index 00000000..9884ea04 --- /dev/null +++ b/deployments/backstage/docker-compose.yml @@ -0,0 +1,2 @@ +--- +name: tyk-demo diff --git a/deployments/backstage/todo.md b/deployments/backstage/todo.md new file mode 100644 index 00000000..4c6c3165 --- /dev/null +++ b/deployments/backstage/todo.md @@ -0,0 +1 @@ +- dynamically create image for backstage so it doesn't have to be run separately? (as per approach taken by the `subscriptions` deployment, using a Dockerfile) \ No newline at end of file diff --git a/deployments/bench/docker-compose.yml b/deployments/bench/docker-compose.yml index 53c36430..1ca7938a 100755 --- a/deployments/bench/docker-compose.yml +++ b/deployments/bench/docker-compose.yml @@ -1,5 +1,4 @@ --- -version: '3.3' services: bench: image: mangomm/go-bench-suite diff --git a/deployments/cicd/docker-compose.yml b/deployments/cicd/docker-compose.yml index c49a8d2c..0d296a08 100644 --- a/deployments/cicd/docker-compose.yml +++ b/deployments/cicd/docker-compose.yml @@ -1,5 +1,4 @@ --- -version: '3.3' services: jenkins: image: jenkins/jenkins:2.319.2-lts-alpine diff --git a/deployments/database-postgres/docker-compose.yml b/deployments/database-postgres/docker-compose.yml index 34cc0b7d..9c98c979 100644 --- a/deployments/database-postgres/docker-compose.yml +++ b/deployments/database-postgres/docker-compose.yml @@ -1,5 +1,4 @@ --- -version: '3.9' services: tyk-postgres: image: postgres:13.3-alpine diff --git a/deployments/federation/docker-compose.yml b/deployments/federation/docker-compose.yml index fe649d62..d8666acb 100644 --- a/deployments/federation/docker-compose.yml +++ b/deployments/federation/docker-compose.yml @@ -1,5 +1,4 @@ --- -version: '3.9' services: users-subgraph: image: zalbiraw/go-api-test-service:v2.0.0 diff --git a/deployments/instrumentation/docker-compose.yml b/deployments/instrumentation/docker-compose.yml index c18813dd..e0e73d7a 100644 --- a/deployments/instrumentation/docker-compose.yml +++ b/deployments/instrumentation/docker-compose.yml @@ -1,5 +1,4 @@ --- -version: '3.3' services: graphite: image: graphiteapp/graphite-statsd:1.1.7-6 diff --git a/deployments/k8s-operator/docker-compose.yml b/deployments/k8s-operator/docker-compose.yml index c246b90c..9884ea04 100644 --- a/deployments/k8s-operator/docker-compose.yml +++ b/deployments/k8s-operator/docker-compose.yml @@ -1,2 +1,2 @@ --- -version: '3.3' +name: tyk-demo diff --git a/deployments/keycloak-dcr/docker-compose.yml b/deployments/keycloak-dcr/docker-compose.yml index 68f0b6c4..635df189 100644 --- a/deployments/keycloak-dcr/docker-compose.yml +++ b/deployments/keycloak-dcr/docker-compose.yml @@ -1,5 +1,4 @@ --- -version: "3.3" services: keycloak-db: image: postgres:9.6 diff --git a/deployments/mailserver/docker-compose.yml b/deployments/mailserver/docker-compose.yml index f6ef8b7e..bb03208e 100644 --- a/deployments/mailserver/docker-compose.yml +++ b/deployments/mailserver/docker-compose.yml @@ -1,5 +1,4 @@ --- -version: '3.3' services: mailserver: image: marcopas/docker-mailslurper diff --git a/deployments/mdcb/docker-compose.yml b/deployments/mdcb/docker-compose.yml index 5c882dd0..553e84c8 100644 --- a/deployments/mdcb/docker-compose.yml +++ b/deployments/mdcb/docker-compose.yml @@ -1,5 +1,4 @@ --- -version: '3.3' services: tyk-mdcb: image: tykio/tyk-mdcb-docker:${MDCB_VERSION:-v2.5.0} diff --git a/deployments/mqtt/docker-compose.yml b/deployments/mqtt/docker-compose.yml index c2bc20c9..052ac58b 100644 --- a/deployments/mqtt/docker-compose.yml +++ b/deployments/mqtt/docker-compose.yml @@ -1,5 +1,4 @@ --- -version: "3.3" services: mosquitto: image: eclipse-mosquitto:1.6.10 diff --git a/deployments/otel-jaeger/docker-compose.yml b/deployments/otel-jaeger/docker-compose.yml index bf1133ec..b045f9ef 100644 --- a/deployments/otel-jaeger/docker-compose.yml +++ b/deployments/otel-jaeger/docker-compose.yml @@ -1,5 +1,4 @@ --- -version: "2" services: # Jaeger jaeger-all-in-one: diff --git a/deployments/otel-new-relic/docker-compose.yml b/deployments/otel-new-relic/docker-compose.yml index dde999a7..69beaf4a 100644 --- a/deployments/otel-new-relic/docker-compose.yml +++ b/deployments/otel-new-relic/docker-compose.yml @@ -1,5 +1,4 @@ --- -version: "2" services: # Collector collector-gateway: diff --git a/deployments/portal/docker-compose.yml b/deployments/portal/docker-compose.yml index 94b79075..0795f675 100644 --- a/deployments/portal/docker-compose.yml +++ b/deployments/portal/docker-compose.yml @@ -1,5 +1,4 @@ --- -version: '3.3' services: tyk-portal: image: tykio/portal:v1.8.3 diff --git a/deployments/slo-prometheus-grafana/docker-compose.yml b/deployments/slo-prometheus-grafana/docker-compose.yml index 3eaee17a..6169e754 100755 --- a/deployments/slo-prometheus-grafana/docker-compose.yml +++ b/deployments/slo-prometheus-grafana/docker-compose.yml @@ -1,5 +1,4 @@ --- -version: '3.3' services: tyk-slo-pump: image: tykio/tyk-pump-docker-pub:${PUMP_VERSION:-v1.9.0} diff --git a/deployments/sso/docker-compose.yml b/deployments/sso/docker-compose.yml index 0491a16e..28c7bb35 100644 --- a/deployments/sso/docker-compose.yml +++ b/deployments/sso/docker-compose.yml @@ -1,5 +1,4 @@ --- -version: '3.3' services: tyk-dashboard-sso: image: tykio/tyk-dashboard:${DASHBOARD_SSO_VERSION:-v5.2.5} diff --git a/deployments/subscriptions/docker-compose.yml b/deployments/subscriptions/docker-compose.yml index 2c242736..a57d98d9 100644 --- a/deployments/subscriptions/docker-compose.yml +++ b/deployments/subscriptions/docker-compose.yml @@ -1,5 +1,4 @@ --- -version: '3.8' services: subscriptions-chatapp: build: ./deployments/subscriptions diff --git a/deployments/tracing/docker-compose.yml b/deployments/tracing/docker-compose.yml index 2975e815..d80607d1 100644 --- a/deployments/tracing/docker-compose.yml +++ b/deployments/tracing/docker-compose.yml @@ -1,5 +1,4 @@ --- -version: '3.3' services: zipkin: image: openzipkin/zipkin-slim:2.21.7 diff --git a/deployments/tyk/docker-compose.yml b/deployments/tyk/docker-compose.yml index 7e79ad68..fb486e4c 100755 --- a/deployments/tyk/docker-compose.yml +++ b/deployments/tyk/docker-compose.yml @@ -1,5 +1,4 @@ --- -version: '3.8' services: tyk-dashboard: image: tykio/tyk-dashboard:${DASHBOARD_VERSION:-v5.3.0} diff --git a/deployments/tyk2/docker-compose.yml b/deployments/tyk2/docker-compose.yml index 5d58d84e..6693518e 100644 --- a/deployments/tyk2/docker-compose.yml +++ b/deployments/tyk2/docker-compose.yml @@ -1,5 +1,4 @@ --- -version: '3.3' services: tyk2-dashboard: image: tykio/tyk-dashboard:${DASHBOARD_VERSION:-v5.3.0} diff --git a/deployments/waf/docker-compose.yml b/deployments/waf/docker-compose.yml index 96116e66..47a79db7 100644 --- a/deployments/waf/docker-compose.yml +++ b/deployments/waf/docker-compose.yml @@ -1,5 +1,4 @@ --- -version: '3.3' services: waf: image: owasp/modsecurity-crs:3.3.4-apache-202302060502 diff --git a/scripts/add-gateway.sh b/scripts/add-gateway.sh index 4ef2c836..45e0a7f8 100755 --- a/scripts/add-gateway.sh +++ b/scripts/add-gateway.sh @@ -6,6 +6,10 @@ docker run \ -d \ -P \ -v $(pwd)/deployments/tyk/volumes/tyk-gateway/tyk.conf:/opt/tyk-gateway/tyk.conf \ + -v $(pwd)/deployments/tyk/volumes/tyk-gateway/certs:/opt/tyk-gateway/certs \ -v $(pwd)/deployments/tyk/volumes/tyk-gateway/middleware:/opt/tyk-gateway/middleware \ + -v $(pwd)/deployments/tyk/volumes/tyk-gateway/plugins:/opt/tyk-gateway/plugins \ + -v $(pwd)/deployments/tyk/volumes/tyk-gateway/templates/error_401.json:/opt/tyk-gateway/templates/error_401.json \ + -v $(pwd)/deployments/tyk/volumes/databases/GeoLite2-Country.mmdb:/opt/tyk-gateway/databases/GeoLite2-Country.mmdb \ --network tyk-demo_tyk \ tykio/tyk-gateway:v5.2.5