From 07266b0e54b424496ca0439f2dca0c20d472d324 Mon Sep 17 00:00:00 2001 From: Alberto Amigo Alonso Date: Thu, 7 Oct 2021 08:23:55 +0200 Subject: [PATCH 1/4] - Kong up and running. issue #295 --- docker-compose.kong.yml | 139 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 139 insertions(+) create mode 100644 docker-compose.kong.yml diff --git a/docker-compose.kong.yml b/docker-compose.kong.yml new file mode 100644 index 00000000..41a64d0e --- /dev/null +++ b/docker-compose.kong.yml @@ -0,0 +1,139 @@ +version: "3.9" + +x-microservice-environment: µservice-environment + - MINOS_BROKER_QUEUE_HOST=postgres + - MINOS_BROKER_HOST=kafka + - MINOS_REPOSITORY_HOST=postgres + - MINOS_SNAPSHOT_HOST=postgres + - MINOS_DISCOVERY_HOST=discovery + +x-microservice-depends-on: µservice-depends-on + - postgres + - kafka + - api-gateway + +services: + zookeeper: + restart: always + image: wurstmeister/zookeeper:latest + logging: + driver: none + + kafka: + restart: always + image: wurstmeister/kafka:latest + ports: + - "9092:9092" + depends_on: + - zookeeper + environment: + KAFKA_ADVERTISED_HOST_NAME: kafka + KAFKA_ADVERTISED_PORT: 9092 + KAFKA_ZOOKEEPER_CONNECT: zookeeper:2181 + + postgres: + restart: always + build: external/postgres + ports: + - "5432:5432" + volumes: + - postgres_volume:/var/lib/postgresql + environment: + - POSTGRES_MULTIPLE_DATABASES=kong,order_db,payment_db,product_db,ticket_db,customer_db,cart_query_db,ticket_query_db,product_query_db,payment_query_db,review_db,review_query_db,auth_db,auth_query_db + - POSTGRES_USER=minos + - POSTGRES_PASSWORD=min0s + logging: + driver: none + + redis: + image: redis:latest + command: "redis-server" + logging: + driver: none + + tavern: + build: external/tavern + profiles: + - donotstart + volumes: + - ./external/tavern/:/tavern/:ro + + kong-migration: + image: kong:latest + command: "kong migrations bootstrap" + restart: on-failure + environment: + KONG_DATABASE: postgres + KONG_PG_HOST: postgres + KONG_PG_USER: minos + KONG_PG_PASSWORD: min0s + depends_on: + - postgres + + api-gateway: + image: kong:latest + restart: always + environment: + KONG_PG_HOST: postgres + KONG_PG_USER: minos + KONG_PG_PASSWORD: min0s + KONG_PROXY_LISTEN: 0.0.0.0:8000 + KONG_PROXY_LISTEN_SSL: 0.0.0.0:8443 + KONG_ADMIN_LISTEN: 0.0.0.0:8001 + depends_on: + - kong-migration + - postgres + ports: + - "8001:8001" + - "8000:8000" + + microservice-order: + restart: always + build: + context: microservices/order + target: production + environment: *microservice-environment + depends_on: *microservice-depends-on + + microservice-payment: + restart: always + build: + context: microservices/payment + target: production + environment: *microservice-environment + depends_on: *microservice-depends-on + + microservice-product: + restart: always + build: + context: microservices/product + target: production + environment: *microservice-environment + depends_on: *microservice-depends-on + + microservice-ticket: + restart: always + build: + context: microservices/ticket + target: production + environment: *microservice-environment + depends_on: *microservice-depends-on + + microservice-customer: + restart: always + build: + context: microservices/customer + target: production + environment: *microservice-environment + depends_on: *microservice-depends-on + + microservice-review: + restart: always + build: + context: microservices/review + target: production + environment: *microservice-environment + depends_on: *microservice-depends-on + +volumes: + postgres_volume: From a4421396acf70c0e63acfd10b3c8d274095700d7 Mon Sep 17 00:00:00 2001 From: Alberto Amigo Alonso Date: Fri, 8 Oct 2021 18:32:17 +0200 Subject: [PATCH 2/4] - Kong up and running. issue #295 --- microservices/product/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/microservices/product/config.yml b/microservices/product/config.yml index 09edf0ef..5dbb1faa 100644 --- a/microservices/product/config.yml +++ b/microservices/product/config.yml @@ -57,6 +57,6 @@ saga: storage: path: "./product.lmdb" discovery: - client: minos.networks.MinosDiscoveryClient + client: minos.networks.KongDiscoveryClient host: localhost - port: 5567 \ No newline at end of file + port: 8001 \ No newline at end of file From 418d9daba5bce885a324691ca6ade76c52a80b64 Mon Sep 17 00:00:00 2001 From: Alberto Amigo Alonso Date: Wed, 13 Oct 2021 10:54:21 +0200 Subject: [PATCH 3/4] - Added postman collection. issue #? --- microservices/product/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/microservices/product/config.yml b/microservices/product/config.yml index 5dbb1faa..09edf0ef 100644 --- a/microservices/product/config.yml +++ b/microservices/product/config.yml @@ -57,6 +57,6 @@ saga: storage: path: "./product.lmdb" discovery: - client: minos.networks.KongDiscoveryClient + client: minos.networks.MinosDiscoveryClient host: localhost - port: 8001 \ No newline at end of file + port: 5567 \ No newline at end of file From b73a9f3a34168dca2484d94e139c004ab1dfb66e Mon Sep 17 00:00:00 2001 From: Alberto Amigo Alonso Date: Wed, 3 Nov 2021 11:48:51 +0100 Subject: [PATCH 4/4] - Docker compose for Kong. issue #295 --- docker-compose.kong.yml | 6 ++++-- external/postgres/Dockerfile | 2 +- microservices/ticket/.dockerignore | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/docker-compose.kong.yml b/docker-compose.kong.yml index 41a64d0e..c704c2b4 100644 --- a/docker-compose.kong.yml +++ b/docker-compose.kong.yml @@ -42,8 +42,8 @@ services: - POSTGRES_MULTIPLE_DATABASES=kong,order_db,payment_db,product_db,ticket_db,customer_db,cart_query_db,ticket_query_db,product_query_db,payment_query_db,review_db,review_query_db,auth_db,auth_query_db - POSTGRES_USER=minos - POSTGRES_PASSWORD=min0s - logging: - driver: none +# logging: +# driver: none redis: image: redis:latest @@ -86,6 +86,8 @@ services: ports: - "8001:8001" - "8000:8000" + extra_hosts: + - "host.docker.internal:172.17.0.1" microservice-order: restart: always diff --git a/external/postgres/Dockerfile b/external/postgres/Dockerfile index 774919f2..844b3f09 100644 --- a/external/postgres/Dockerfile +++ b/external/postgres/Dockerfile @@ -1,2 +1,2 @@ -FROM postgres +FROM postgres:9.5 COPY create-multiple-postgresql-databases.sh /docker-entrypoint-initdb.d/ \ No newline at end of file diff --git a/microservices/ticket/.dockerignore b/microservices/ticket/.dockerignore index 2a3553cb..eac37160 100644 --- a/microservices/ticket/.dockerignore +++ b/microservices/ticket/.dockerignore @@ -1,3 +1,3 @@ -.venv +.venv/ *.lmdb dist/ \ No newline at end of file