1 Commits

Author SHA1 Message Date
50c74fdb71 I think it is working now...
Some checks failed
continuous-integration/drone/push Build is failing
2023-05-06 00:48:27 -04:00
4 changed files with 10 additions and 33 deletions

View File

@@ -7,9 +7,9 @@ services:
ports: ports:
- 27017:27017 - 27017:27017
networks: networks:
- docknet - labs-net
volumes: volumes:
# - /var/tmp/labs:/data/db - /var/tmp/labs:/data/db
- ./mongo-init.js:/docker-entrypoint-initdb.d/mongo-init.js:ro - ./mongo-init.js:/docker-entrypoint-initdb.d/mongo-init.js:ro
restart: unless-stopped restart: unless-stopped
image: mongo:latest image: mongo:latest
@@ -18,17 +18,15 @@ services:
build: . build: .
container_name: ${CONTAINER_PREFIX:-dev}-auth-service container_name: ${CONTAINER_PREFIX:-dev}-auth-service
ports: ports:
- 9000:9000 - 9001:9001
environment: environment:
- DB_HOST=${CONTAINER_PREFIX:-dev}-auth-service_mongo - DB_HOST=${CONTAINER_PREFIX:-dev}-auth-service_mongo
networks: networks:
- docknet - labs-net
restart: unless-stopped restart: unless-stopped
image: node:20-alpine image: node:20-alpine
links:
- auth-service_mongo:${CONTAINER_PREFIX:-dev}-auth-service_mongo
depends_on: depends_on:
- auth-service_mongo - auth-service_mongo
networks: networks:
docknet: labs-net:
name: docknet name: labs-net

View File

@@ -4,11 +4,6 @@ services:
auth-service_mongo: auth-service_mongo:
container_name: ${CONTAINER_PREFIX}-auth-service_mongo container_name: ${CONTAINER_PREFIX}-auth-service_mongo
env_file: .env env_file: .env
environment:
- ALLOW_EMPTY_PASSWORD=yes
- MONGO_INITDB_ROOT_USERNAME=${DB_USERNAME}
- MONGO_INITDB_ROOT_PASSWORD=${DB_PASSWORD}
- MONGO_INITDB_DATABASE=${DB_NAME}
networks: networks:
- docknet - docknet
volumes: volumes:
@@ -20,21 +15,7 @@ services:
build: . build: .
container_name: ${CONTAINER_PREFIX}-auth-service container_name: ${CONTAINER_PREFIX}-auth-service
environment: environment:
- PORT=${PORT}
- ROUTE_PREFIX=${ROUTE_PREFIX}
- LOGIN_ROUTE=${LOGIN_ROUTE}
- RESET_ROUTE=${RESET_ROUTE}
- DB_HOST=${CONTAINER_PREFIX}-auth-service_mongo - DB_HOST=${CONTAINER_PREFIX}-auth-service_mongo
- DB_USERNAME=${DB_USERNAME}
- DB_PASSWORD=${DB_PASSWORD}
- DB_NAME=${DB_NAME}
- SESSION_KEY=${SESSION_KEY}
- JWT_AUDIENCE=${JWT_AUDIENCE}
- JWT_ISSUER=${JWT_ISSUER}
- JWT_SECRET=${JWT_SECRET}
- LOGIN_VALID_TIME=${LOGIN_VALID_TIME}
- RESET_VALID_MINUTES=${RESET_VALID_MINUTES}
- DEFAULT_TOKEN_DAYS=${DEFAULT_TOKEN_DAYS}
labels: labels:
- 'traefik.enable=true' - 'traefik.enable=true'
- 'traefik.http.routers.grow.rule=Host(`${HOST}`) && Path(`${ROUTE_PREFIX}`)' - 'traefik.http.routers.grow.rule=Host(`${HOST}`) && Path(`${ROUTE_PREFIX}`)'
@@ -47,10 +28,9 @@ services:
- docknet - docknet
restart: unless-stopped restart: unless-stopped
image: node image: node
links:
- auth-service_mongo:${CONTAINER_PREFIX}-auth-service_mongo
depends_on: depends_on:
- auth-service_mongo - auth-service_mongo
networks: networks:
docknet: docknet:
name: docknet name: docknet
external: true

View File

@@ -1,5 +1,5 @@
/* eslint-disable no-undef */ /* eslint-disable no-undef */
db = db.getSiblingDB(process.env.DB_NAME || 'not_set'); db = db.getSiblingDB(process.env.DB_NAME);
db.createUser({ db.createUser({
user: process.env.DB_USERNAME, user: process.env.DB_USERNAME,
pwd: process.env.DB_PASSWORD, pwd: process.env.DB_PASSWORD,

View File

@@ -1,6 +1,6 @@
{ {
"name": "@mifi/auth", "name": "@mifi/auth",
"version": "0.0.25", "version": "0.0.26",
"author": "mifi (Mike Fitzpatrick)", "author": "mifi (Mike Fitzpatrick)",
"license": "MIT", "license": "MIT",
"scripts": { "scripts": {
@@ -80,6 +80,5 @@
"repository": { "repository": {
"type": "git", "type": "git",
"url": "https://git.mifi.dev/mifi/auth.git" "url": "https://git.mifi.dev/mifi/auth.git"
}, }
"registry": "https://git.mifi.dev"
} }