Merge pull request #254 from TykTechnologies/docker-compose-version-bump

Docker compose version bump

deployments/analytics-datadog/docker-compose.yml

@@ -1,5 +1,4 @@
 ---
-version: '3.3'
 services:
   dd-agent:
     image: gcr.io/datadoghq/agent:latest

deployments/analytics-kibana/docker-compose.yml

@@ -1,5 +1,4 @@
 ---
-version: '3.3'
 services:
   kibana:
     image: docker.elastic.co/kibana/kibana:7.17.1

deployments/analytics-splunk/docker-compose.yml

@@ -1,5 +1,4 @@
 ---
-version: '3.3'
 services:
   tyk-splunk:
     image: splunk/splunk:latest

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 "

deployments/backstage/docker-compose.yml

@@ -0,0 +1,2 @@
+---
+name: tyk-demo

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)

deployments/bench/docker-compose.yml

@@ -1,5 +1,4 @@
 ---
-version: '3.3'
 services:
   bench:
     image: mangomm/go-bench-suite

deployments/cicd/docker-compose.yml

@@ -1,5 +1,4 @@
 ---
-version: '3.3'
 services:
   jenkins:
     image: jenkins/jenkins:2.319.2-lts-alpine

deployments/database-postgres/docker-compose.yml

@@ -1,5 +1,4 @@
 ---
-version: '3.9'
 services:
   tyk-postgres:
     image: postgres:13.3-alpine

deployments/federation/docker-compose.yml

@@ -1,5 +1,4 @@
 ---
-version: '3.9'
 services:
   users-subgraph:
     image: zalbiraw/go-api-test-service:v2.0.0

deployments/instrumentation/docker-compose.yml

@@ -1,5 +1,4 @@
 ---
-version: '3.3'
 services:
   graphite:
     image: graphiteapp/graphite-statsd:1.1.7-6

deployments/k8s-operator/docker-compose.yml

@@ -1,2 +1,2 @@
 ---
-version: '3.3'
+name: tyk-demo

deployments/keycloak-dcr/docker-compose.yml

@@ -1,5 +1,4 @@
 ---
-version: "3.3"
 services:
   keycloak-db:
     image: postgres:9.6

deployments/mailserver/docker-compose.yml

@@ -1,5 +1,4 @@
 ---
-version: '3.3'
 services:
   mailserver:
     image: marcopas/docker-mailslurper

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}

deployments/mqtt/docker-compose.yml

@@ -1,5 +1,4 @@
 ---
-version: "3.3"
 services:
   mosquitto:
     image: eclipse-mosquitto:1.6.10

deployments/otel-jaeger/docker-compose.yml

@@ -1,5 +1,4 @@
 ---
-version: "2"
 services:
   # Jaeger
   jaeger-all-in-one:

deployments/otel-new-relic/docker-compose.yml

@@ -1,5 +1,4 @@
 ---
-version: "2"
 services:
   # Collector
   collector-gateway:

deployments/portal/docker-compose.yml

@@ -1,5 +1,4 @@
 ---
-version: '3.3'
 services:
   tyk-portal:
     image: tykio/portal:v1.8.3

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}

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}

deployments/subscriptions/docker-compose.yml

@@ -1,5 +1,4 @@
 ---
-version: '3.8'
 services:
   subscriptions-chatapp:
     build: ./deployments/subscriptions

deployments/tracing/docker-compose.yml

@@ -1,5 +1,4 @@
 ---
-version: '3.3'
 services:
   zipkin:
     image: openzipkin/zipkin-slim:2.21.7

deployments/tyk/docker-compose.yml

@@ -1,5 +1,4 @@
 ---
-version: '3.8'
 services:
   tyk-dashboard:
     image: tykio/tyk-dashboard:${DASHBOARD_VERSION:-v5.3.0}

deployments/tyk2/docker-compose.yml

@@ -1,5 +1,4 @@
 ---
-version: '3.3'
 services:
   tyk2-dashboard:
     image: tykio/tyk-dashboard:${DASHBOARD_VERSION:-v5.3.0}

deployments/waf/docker-compose.yml

@@ -1,5 +1,4 @@
 ---
-version: '3.3'
 services:
   waf:
     image: owasp/modsecurity-crs:3.3.4-apache-202302060502

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