From e6389d8b9bd869d397d2ef0ac7e5d1884f48e10c Mon Sep 17 00:00:00 2001 From: mifi Date: Fri, 5 May 2023 11:05:18 -0400 Subject: [PATCH] More tweaks... --- dev.env | 4 ++-- docker-compose.yml | 12 ++++++------ package.json | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dev.env b/dev.env index 5b48508..c9bae52 100644 --- a/dev.env +++ b/dev.env @@ -1,4 +1,4 @@ -HOST=grow.mifi.dev +HOST=localhost PORT=9001 ROUTE_PREFIX=/auth @@ -20,6 +20,6 @@ LOGIN_VALID_TIME=12H RESET_VALID_MINUTES=15 DEFAULT_TOKEN_DAYS=1 -CONTAINER_PREFIX=grow +CONTAINER_PREFIX=sso SERVICE_NAME=auth-service DB_TYPE=mongo diff --git a/docker-compose.yml b/docker-compose.yml index 1450ccf..b893077 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,7 +2,7 @@ version: '3.8' services: auth-service_mongo: - container_name: ${CONTAINER_PREFIX}-${SERVICE_NAME}_${DB_TYPE} + container_name: ${CONTAINER_PREFIX:package}-auth-service_mongo env_file: .env environment: - ALLOW_EMPTY_PASSWORD=yes @@ -18,13 +18,13 @@ services: auth-service: env_file: .env build: . - container_name: ${CONTAINER_PREFIX}-${SERVICE_NAME} + container_name: ${CONTAINER_PREFIX:package}-auth-service environment: - PORT=${PORT} - ROUTE_PREFIX=${ROUTE_PREFIX} - LOGIN_ROUTE=${LOGIN_ROUTE} - RESET_ROUTE=${RESET_ROUTE} - - DB_HOST=${CONTAINER_PREFIX}-${SERVICE_NAME}_${DB_TYPE} + - DB_HOST=${CONTAINER_PREFIX:package}-auth-service_mongo - DB_USER=${DB_USERNAME} - DB_PASS=${DB_PASSWORD} - DB_NAME=${DB_NAME} @@ -41,14 +41,14 @@ services: - 'traefik.http.routers.grow.entrypoints=websecure' - 'traefik.http.routers.grow.tls=true' - 'traefik.http.routers.grow.tls.certresolver=letsencrypt' - - 'traefik.http.routers.grow.service=gitea' - - 'traefik.http.services.gitea.loadbalancer.server.port=${PORT}' + - 'traefik.http.routers.grow.service=grow-service' + - 'traefik.http.services.grow-service.loadbalancer.server.port=${PORT}' networks: - docknet restart: unless-stopped image: node links: - - auth-service_mongo:${CONTAINER_PREFIX}-${SERVICE_NAME}_${DB_TYPE} + - auth-service_mongo:${CONTAINER_PREFIX:package}-auth-service_mongo depends_on: - auth-service_mongo networks: diff --git a/package.json b/package.json index 809a714..20333a6 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@mifi/auth", - "version": "0.0.20", + "version": "0.0.21", "author": "mifi (Mike Fitzpatrick)", "license": "MIT", "scripts": {