From d9285e4bec0210fbf4707c51a2887bdfa1f89af9 Mon Sep 17 00:00:00 2001 From: mifi Date: Fri, 12 May 2023 15:37:32 -0400 Subject: [PATCH] Working setups for dev and staging! (mostly) TODO: Still no access to routes on staging... hmmm... --- docker-compose.dev.yml | 1 - docker-compose.staging-build.yml | 4 ++-- lib/server/controllers/auth.ts | 3 +-- mongo-init.js | 11 ----------- 4 files changed, 3 insertions(+), 16 deletions(-) delete mode 100644 mongo-init.js diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml index 3dab749..6bea77f 100644 --- a/docker-compose.dev.yml +++ b/docker-compose.dev.yml @@ -11,7 +11,6 @@ services: volumes: - auth-db:/data/db - auth-db:/data/configdb - # - ./mongo-init.js:/docker-entrypoint-initdb.d/mongo-init.js:ro restart: unless-stopped image: mongo:latest auth-service: diff --git a/docker-compose.staging-build.yml b/docker-compose.staging-build.yml index 6f3822d..2eaa5c3 100644 --- a/docker-compose.staging-build.yml +++ b/docker-compose.staging-build.yml @@ -2,7 +2,7 @@ version: '3.8' services: auth-service_mongo: - container_name: ${CONTAINER_PREFIX:-staging}-auth-service_mongodb + container_name: ${CONTAINER_PREFIX:-staging}-auth-service_mongo env_file: - staging.env build: @@ -28,7 +28,7 @@ services: - PORT - ENV environment: - - DB_HOST=${CONTAINER_PREFIX:-staging}-auth-service_mongodb + - DB_HOST=${CONTAINER_PREFIX:-staging}-auth-service_mongo labels: - 'traefik.enable=true' - 'traefik.http.routers.grow.rule=Host(`${HOST}`) && Path(`${ROUTE_PREFIX}`)' diff --git a/lib/server/controllers/auth.ts b/lib/server/controllers/auth.ts index 1d1b0ea..836285a 100644 --- a/lib/server/controllers/auth.ts +++ b/lib/server/controllers/auth.ts @@ -9,8 +9,7 @@ import passport from '../passport'; import { ErrorCodes, getErrorBody } from '../../constants/errors'; import { authenticated } from '../middleware/authenication'; -// const routerOpts: Router.IRouterOptions = { prefix }; -const routerOpts: Router.IRouterOptions = {}; +const routerOpts: Router.IRouterOptions = { prefix }; const router: Router = new Router(routerOpts); router.get('/info', (ctx) => { diff --git a/mongo-init.js b/mongo-init.js deleted file mode 100644 index edc4dec..0000000 --- a/mongo-init.js +++ /dev/null @@ -1,11 +0,0 @@ -/* eslint-disable no-undef */ -db.createUser({ - user: process.env.DB_USERNAME, - pwd: process.env.DB_PASSWORD, - roles: [ - { - role: 'readWrite', - db: process.env.DB_NAME, - }, - ], -});