From 250fa14a8857311897124ba2232b5b9efcbac104 Mon Sep 17 00:00:00 2001 From: Aristotle <11413392+tuxranger@users.noreply.github.com> Date: Thu, 18 Mar 2021 15:44:03 -0400 Subject: [PATCH] motiv-labs/janus#463 reverted changes to mongo example, updated circle config --- .circleci/config.yml | 2 +- examples/front-proxy-mongo/apis/example.json | 33 ++++++++++++------- examples/front-proxy-mongo/docker-compose.yml | 12 +++---- 3 files changed, 28 insertions(+), 19 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 8294c4a4a..d4ad5ce33 100755 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -45,4 +45,4 @@ workflows: filters: branches: only: - - janus#463-cassandra-repo + - master diff --git a/examples/front-proxy-mongo/apis/example.json b/examples/front-proxy-mongo/apis/example.json index 603a6ac8c..433984a22 100644 --- a/examples/front-proxy-mongo/apis/example.json +++ b/examples/front-proxy-mongo/apis/example.json @@ -1,14 +1,23 @@ -{ - "name" : "my-endpoint", - "active" : true, - "proxy" : { - "listen_path" : "/example/*", - "upstreams" : { - "balancing": "roundrobin", - "targets": [ - {"target": "http://www.mocky.io/v2/595625d22900008702cd71e8"} - ] +[ + { + "name" : "example", + "active" : true, + "proxy" : { + "preserve_host" : false, + "listen_path" : "/example/*", + "upstreams" : { + "balancing": "roundrobin", + "targets": [ + {"target": "http://service1:8080/"} + ] + }, + "strip_path" : false, + "append_path" : false, + "methods" : ["GET"] }, - "methods" : ["GET"] + "health_check": { + "url": "http://service1:8080/status", + "timeout": 3 + } } -} +] diff --git a/examples/front-proxy-mongo/docker-compose.yml b/examples/front-proxy-mongo/docker-compose.yml index 97073b804..d40e2b246 100644 --- a/examples/front-proxy-mongo/docker-compose.yml +++ b/examples/front-proxy-mongo/docker-compose.yml @@ -22,12 +22,12 @@ services: - "27017:27017" # This container is just a helper to seed the database -# mongo-seed: -# build: -# context: . -# dockerfile: seed.Dockerfile -# depends_on: -# - janus-database + mongo-seed: + build: + context: . + dockerfile: seed.Dockerfile + depends_on: + - janus-database service1: image: rodolpheche/wiremock