From 1228efb70f85bfb6d8dd53689e722869ff478633 Mon Sep 17 00:00:00 2001 From: Hongbo Wu Date: Mon, 21 Nov 2022 10:36:41 +0800 Subject: [PATCH] Add docker-compose service --- docker-compose.yml | 18 ++++++++++++++++++ packages/rule-handler/package.json | 5 ++--- packages/text-to-speech/Dockerfile | 2 +- 3 files changed, 21 insertions(+), 4 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 170ca72fa..a1fefab93 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -149,3 +149,21 @@ services: depends_on: api: condition: service_healthy + + rule-handler: + build: + context: . + dockerfile: ./packages/rule-handler/Dockerfile + container_name: "omnivore-rule-handler" + ports: + - "9091:8080" + environment: + - PUBSUB_VERIFICATION_TOKEN=some_token + - PG_HOST=postgres + - PG_PORT=5432 + - PG_USER=app_user + - PG_PASSWORD=app_pass + - PG_DB=omnivore + depends_on: + migrate: + condition: service_completed_successfully diff --git a/packages/rule-handler/package.json b/packages/rule-handler/package.json index 4b6b5be90..487b0e8a7 100644 --- a/packages/rule-handler/package.json +++ b/packages/rule-handler/package.json @@ -12,9 +12,7 @@ "compile": "tsc", "build": "tsc", "start": "functions-framework --target=ruleHandler", - "dev": "concurrently \"tsc -w\" \"nodemon --watch ./build/ --exec npm run start\"", - "gcloud-deploy": "gcloud functions deploy rule-handler --gen2 --entry-point=ruleHandler --trigger-http --allow-unauthenticated --region=us-west2 --runtime nodejs14", - "deploy": "yarn build && yarn gcloud-deploy" + "dev": "concurrently \"tsc -w\" \"nodemon --watch ./build/ --exec npm run start\"" }, "devDependencies": { "chai": "^4.3.6", @@ -26,6 +24,7 @@ "dotenv": "^16.0.1", "firebase-admin": "^10.0.2", "@sentry/serverless": "^6.16.1", + "pg": "^8.3.3", "typeorm": "^0.3.4", "typeorm-naming-strategies": "^4.1.0" } diff --git a/packages/text-to-speech/Dockerfile b/packages/text-to-speech/Dockerfile index 7e4fb5fea..0ef7fe540 100644 --- a/packages/text-to-speech/Dockerfile +++ b/packages/text-to-speech/Dockerfile @@ -23,5 +23,5 @@ RUN yarn install --pure-lockfile --production EXPOSE 8080 -CMD ["yarn", "workspace", "@omnivore/text-to-speech-handler", "start"] +CMD ["yarn", "workspace", "@omnivore/text-to-speech-handler", "start_streaming"]