From 7ab9dc59967da71a762a24d51beef9ef2b767af4 Mon Sep 17 00:00:00 2001 From: Kalane Date: Sat, 11 Sep 2021 18:08:30 +0200 Subject: [PATCH] chore: add health-check + docker-compose file for redis/pg --- server-v2/config/database.ts | 2 +- server-v2/config/redis.ts | 1 + server-v2/docker-compose.yml | 26 ++++++++++++++++++++++++++ server-v2/start/routes.ts | 3 ++- 4 files changed, 30 insertions(+), 2 deletions(-) create mode 100644 server-v2/docker-compose.yml diff --git a/server-v2/config/database.ts b/server-v2/config/database.ts index a593aa8..fc59b95 100644 --- a/server-v2/config/database.ts +++ b/server-v2/config/database.ts @@ -45,7 +45,7 @@ const databaseConfig: DatabaseConfig = { migrations: { naturalSort: true, }, - healthCheck: false, + healthCheck: true, debug: false, }, }, diff --git a/server-v2/config/redis.ts b/server-v2/config/redis.ts index 3d8a6ce..ef77090 100644 --- a/server-v2/config/redis.ts +++ b/server-v2/config/redis.ts @@ -41,6 +41,7 @@ const redisConfig: RedisConfig = { password: Env.get('REDIS_PASSWORD', ''), db: 0, keyPrefix: '', + healthCheck: true, }, }, } diff --git a/server-v2/docker-compose.yml b/server-v2/docker-compose.yml new file mode 100644 index 0000000..d0cdac1 --- /dev/null +++ b/server-v2/docker-compose.yml @@ -0,0 +1,26 @@ +version: "3" +services: + leaguestats-redis: + container_name: leaguestats-redis + image: redis:6-alpine + ports: + - '127.0.0.1:6379:6379' + volumes: + - leaguestats-redisData:/data + restart: always + leaguestats-postgres: + container_name: leaguestats-postgres + image: postgres:12-alpine + ports: + - '127.0.0.1:5432:5432' + environment: + - POSTGRES_DB=leaguestats + - POSTGRES_USER=root + - POSTGRES_PASSWORD=root + - POSTGRES_HOST_AUTH_METHOD=trust + volumes: + - leaguestats-postgresData:/var/lib/postgresql/data + restart: always +volumes: + leaguestats-redisData: + leaguestats-postgresData: diff --git a/server-v2/start/routes.ts b/server-v2/start/routes.ts index 91582cf..b7b5ced 100644 --- a/server-v2/start/routes.ts +++ b/server-v2/start/routes.ts @@ -18,8 +18,9 @@ | */ +import HealthCheck from '@ioc:Adonis/Core/HealthCheck' import Route from '@ioc:Adonis/Core/Route' Route.get('/', async () => { - return { hello: 'world from LeagueStats V2' } + return { report: await HealthCheck.getReport() } })