Hmmmm

.drone.yml

@@ -58,10 +58,11 @@ steps:
       - failure
 
 trigger:
+  branch:
+  - main
   event:
   - pull_request
   - push
-  - tag
 
 ---
 kind: pipeline
@@ -73,7 +74,7 @@ workspace:
   path: /drone/grow
 
 steps:
-- name: Build Service
+- name: Build Package
   image: node:latest
   commands:
     - yarn install
@@ -154,12 +155,13 @@ volumes:
     path: /volume1/docker/grow/labs-auth/.npmrc
 
 depends_on:
-  - Build Pipeline
+  - Test Pipeline
 
 trigger:
   branch:
   - main
   event:
+  - push
   - tag
 
 ---
@@ -175,7 +177,9 @@ steps:
   image: docker
   privileged: true
   commands:
+    - docker compose pull
     - docker compose build --no-cache
+    - docker compose rm --stop
     - docker compose up --wait
   volumes:
   - name: env
@@ -210,13 +214,14 @@ 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:
-  - Build Pipeline
+  - Test Pipeline
 
 trigger:
   branch:
   - main
   event:
+  - push
   - tag

Dockerfile

@@ -23,5 +23,4 @@ WORKDIR /home/node/app
 COPY package*.json ./
 RUN yarn install --frozen-lockfile --production
 COPY --from=0 /home/node/app/dist .
-EXPOSE 80
 CMD ["node","server/index.js"]

dev.env

@@ -0,0 +1,25 @@
+HOST=grow.mifi.dev
+PORT=9001
+
+ROUTE_PREFIX=/auth
+
+LOGIN_ROUTE=/login
+RESET_ROUTE=/reset
+
+DB_USERNAME=user
+DB_PASSWORD=password
+DB_NAME=auth
+
+SESSION_KEY=shjhakjfhfjdshjksdhfdshfhfduyeyb73te4
+
+JWT_AUDIENCE=Grow.io
+JWT_ISSUER=Grow Latch
+JWT_SECRET='Th!sIs a d3v3lopm3nt server $#cr¢T.'
+
+LOGIN_VALID_TIME=12H
+RESET_VALID_MINUTES=15
+DEFAULT_TOKEN_DAYS=1
+
+CONTAINER_PREFIX=grow
+SERVICE_NAME=auth-service
+DB_TYPE=mongo

docker-compose.yml

@@ -3,10 +3,11 @@ version: '3.8'
 services:
     auth-service_mongo:
         container_name: ${CONTAINER_PREFIX}-${SERVICE_NAME}_${DB_TYPE}
+        env_file: .env
         environment:
             - ALLOW_EMPTY_PASSWORD=yes
-            - MONGO_INITDB_ROOT_USERNAME=${DB_USER}
+            - MONGO_INITDB_ROOT_USERNAME=${DB_USERNAME}
-            - MONGO_INITDB_ROOT_PASSWORD=${DB_PASS}
+            - MONGO_INITDB_ROOT_PASSWORD=${DB_PASSWORD}
             - MONGO_INITDB_DATABASE=${DB_NAME}
         networks:
             - docknet
@@ -15,6 +16,7 @@ services:
         restart: unless-stopped
         image: mongo
     auth-service:
+        env_file: .env
         build: .
         container_name: ${CONTAINER_PREFIX}-${SERVICE_NAME}
         environment:
@@ -23,8 +25,8 @@ services:
             - LOGIN_ROUTE=${LOGIN_ROUTE}
             - RESET_ROUTE=${RESET_ROUTE}
             - DB_HOST=${CONTAINER_PREFIX}-${SERVICE_NAME}_${DB_TYPE}
-            - DB_USER=${DB_USER}
+            - DB_USER=${DB_USERNAME}
-            - DB_PASS=${DB_PASS}
+            - DB_PASS=${DB_PASSWORD}
             - DB_NAME=${DB_NAME}
             - SESSION_KEY=${SESSION_KEY}
             - JWT_AUDIENCE=${JWT_AUDIENCE}
@@ -35,8 +37,7 @@ services:
             - DEFAULT_TOKEN_DAYS=${DEFAULT_TOKEN_DAYS}
         labels:
             - 'traefik.enable=true'
-            - 'traefik.http.routers.grow.rule=Host(`${HOST}`)'
+            - 'traefik.http.routers.grow.rule=Host(`${HOST}`) && Path(`${ROUTE_PREFIX}`)'
-            - 'traefik.http.routers.grow.rule=Path(`${ROUTE_PREFIX}`)'
             - 'traefik.http.routers.grow.entrypoints=websecure'
             - 'traefik.http.routers.grow.tls=true'
             - 'traefik.http.routers.grow.tls.certresolver=letsencrypt'
@@ -46,6 +47,8 @@ services:
             - docknet
         restart: unless-stopped
         image: node
+        links:
+            - auth-service_mongo:${CONTAINER_PREFIX}-${SERVICE_NAME}_${DB_TYPE}
         depends_on:
             - auth-service_mongo
 networks:

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mifi/auth",
-  "version": "0.0.10",
+  "version": "0.0.19",
   "author": "mifi (Mike Fitzpatrick)",
   "license": "MIT",
   "scripts": {