diff --git a/.drone.yml b/.drone.yml index f82f237..a1f6124 100644 --- a/.drone.yml +++ b/.drone.yml @@ -214,7 +214,7 @@ volumes: path: /var/run/docker.sock - name: env host: - path: /volume1/docker/labs/grow-auth/.env + path: /volume1/docker/labs/grow-auth/staging.env depends_on: - Test Pipeline diff --git a/docker-compose.yml b/docker-compose.yml index cc68aee..33e448b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,7 +3,7 @@ version: '3.8' services: auth-service_mongo: container_name: ${CONTAINER_PREFIX}-${SERVICE_NAME}_${DB_TYPE} - env_file: staging.env + env_file: .env environment: - ALLOW_EMPTY_PASSWORD=yes - MONGO_INITDB_ROOT_USERNAME=${DB_USERNAME} @@ -16,29 +16,28 @@ services: restart: unless-stopped image: mongo auth-service: - env_file: staging.env + env_file: .env build: . container_name: ${CONTAINER_PREFIX}-${SERVICE_NAME} environment: - # - PORT=${PORT} - # - ROUTE_PREFIX=${ROUTE_PREFIX} - # - LOGIN_ROUTE=${LOGIN_ROUTE} - # - RESET_ROUTE=${RESET_ROUTE} + - PORT=${PORT} + - ROUTE_PREFIX=${ROUTE_PREFIX} + - LOGIN_ROUTE=${LOGIN_ROUTE} + - RESET_ROUTE=${RESET_ROUTE} - DB_HOST=${CONTAINER_PREFIX}-${SERVICE_NAME}_${DB_TYPE} - # - DB_USER=${DB_USERNAME} - # - DB_PASS=${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} + - DB_USER=${DB_USERNAME} + - DB_PASS=${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: - 'traefik.enable=true' - - 'traefik.http.routers.grow.rule=Host(`${HOST}`)' - - 'traefik.http.routers.grow.rule=Path(`${ROUTE_PREFIX}`)' + - 'traefik.http.routers.grow.rule=Host(`${HOST}`) && Path(`${ROUTE_PREFIX}`)' - 'traefik.http.routers.grow.entrypoints=websecure' - 'traefik.http.routers.grow.tls=true' - 'traefik.http.routers.grow.tls.certresolver=letsencrypt' diff --git a/package.json b/package.json index 87482b5..93223d8 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@mifi/auth", - "version": "0.0.17", + "version": "0.0.19", "author": "mifi (Mike Fitzpatrick)", "license": "MIT", "scripts": {