More tweaks...

.drone.yml

@@ -1,96 +1,70 @@
-# kind: pipeline
+kind: pipeline
-# type: docker
+type: docker
-# name: Test Pipeline
+name: Test Pipeline
 
-# workspace:
+workspace:
-#   path: /drone/grow
+  path: /drone/grow
 
-# steps:
+steps:
-# - name: yarn install
+- name: yarn install
-#   image: node:latest
+  image: node:latest
-#   commands:
+  commands:
-#   - yarn install
+  - yarn install
+- name: Code Style Checks
+  image: node:latest
+  commands:
+  - yarn prettier
+- name: Lint
+  image: node:latest
+  commands:
+  - yarn lint
+- name: Unit Tests
+  image: node:latest
+  commands:
+  - yarn test
+- name: Send Test Status Notification
+  image: plugins/webhook
+  settings:
+    urls: https://lab.mifi.dev/hooks/9p65zpagctgkmndo8nwwm4199r
+    content_type: application/json
+    template: |
+      {
+        "icon_url":"https://emojipedia-us.s3.dualstack.us-west-1.amazonaws.com/thumbs/120/apple/198/freezing-face_1f976.png",
+        "text": "[{{ repo.name }} - Build # {{ build.number }}] Code Quality Checks {{ build.status }} {{#success build.status}}:tada:{{else}}:poop:{{/success}}",
+        "username":"DroneBot"
+      }
+  when:
+    status:
+      - success
+      - failure
+- name: Build
+  image: node:latest
+  commands:
+  - yarn build
+- name: Send Build Status Notifications
+  image: plugins/webhook
+  settings:
+    urls: https://lab.mifi.dev/hooks/9p65zpagctgkmndo8nwwm4199r
+    content_type: application/json
+    template: |
+      {
+        "icon_url":"https://emojipedia-us.s3.dualstack.us-west-1.amazonaws.com/thumbs/120/apple/198/freezing-face_1f976.png",
+        "text": "[{{ repo.name }} - Build # {{ build.number }}] Build package {{ build.status }} {{#success build.status}}:tada:{{else}}:poop:{{/success}}",
+        "username":"DroneBot"
+      }
+  when:
+    status:
+      - success
+      - failure
 
-# - name: Code Style Checks
+trigger:
-#   image: node:latest
+  branch:
-#   commands:
+  - main
-#   - yarn prettier
+  event:
+  - pull_request
+  - push
 
-# - name: Lint
+---
-#   image: node:latest
-#   commands:
-#   - yarn lint
-
-# - name: Unit Tests
-#   image: node:latest
-#   commands:
-#   - yarn test
-
-# - name: Send Status Notification
-#   image: plugins/webhook
-#   settings:
-#     urls: https://lab.mifi.dev/hooks/9p65zpagctgkmndo8nwwm4199r
-#     content_type: application/json
-#     template: |
-#       {
-#         "icon_url":"https://emojipedia-us.s3.dualstack.us-west-1.amazonaws.com/thumbs/120/apple/198/freezing-face_1f976.png",
-#         "text": "[{{ repo.name }} - Build # {{ build.number }}] Code Quality Checks {{ build.status }} {{#success build.status}}:tada:{{else}}:poop:{{/success}}",
-#         "username":"DroneBot"
-#       }
-#   when:
-#     status:
-#       - success
-#       - failure
-
-# trigger:
-#   event:
-#   - push
-
-# ---
-# kind: pipeline
-# type: docker
-# name: Build Pipeline
-
-# workspace:
-#   path: /drone/grow
-
-# steps:
-# - name: yarn install
-#   image: node:latest
-#   commands:
-#   - yarn install
-
-# - name: Build
-#   image: node:latest
-#   commands:
-#   - yarn build
-
-# - name: Send Status Notifications
-#   image: plugins/webhook
-#   settings:
-#     urls: https://lab.mifi.dev/hooks/ccw34hdf7tgbjmzp96nptn938r
-#     content_type: application/json
-#     template: |
-#       {
-#         "icon_url":"https://emojipedia-us.s3.dualstack.us-west-1.amazonaws.com/thumbs/120/apple/198/freezing-face_1f976.png",
-#         "text": "[{{ repo.name }} - Build # {{ build.number }}] Build package {{ build.status }} {{#success build.status}}:tada:{{else}}:poop:{{/success}}",
-#         "username":"DroneBot"
-#       }
-#   when:
-#     status:
-#       - success
-#       - failure
-
-# depends_on:
-#   - Test Pipeline
-
-# trigger:
-#   branch:
-#   - main
-#   event:
-#   - push
-
-# ---
 kind: pipeline
 type: docker
 name: Publish Pipeline
@@ -100,7 +74,7 @@ workspace:
   path: /drone/grow
 
 steps:
-- name: Build Service
+- name: Build Package
   image: node:latest
   commands:
     - yarn install
@@ -117,8 +91,8 @@ steps:
     token:
     - from_secret: gitea_token
   volumes:
-  - name: yarnrc
+  - name: npmrc
-    path: /drone/grow/.yarnrc.yml
+    path: /drone/grow/.npmrc
 - name: Report NPM Publish Status
   image: plugins/webhook
   settings:
@@ -140,6 +114,7 @@ steps:
     auto_tag: true
     squash: true
     repo: git.mifi.dev/mifi/auth
+    context: mifi
     registry: git.mifi.dev
     username:
       from_secret: registry_username
@@ -169,24 +144,25 @@ steps:
       - failure
 
 volumes:
-- name: yarnrc
+- name: dockerconfig
   host:
-    path: /Volume1/docker/.yarnrc.yml
+    path: /volume1/docker/dockerconfig.json
 - name: dockersock
   host:
     path: /var/run/docker.sock
-- name: dockerconfig
+- name: npmrc
   host:
-    path: /volume1/docker/labs/grow-auth/dockerconfig.json
+    path: /volume1/docker/beethoven/labs-auth/.npmrc
 
-# depends_on:
+depends_on:
-#   - Build Pipeline
+  - Test Pipeline
 
 trigger:
   branch:
   - main
-  # event:
+  event:
-  # - tag
+  - push
+  - tag
 
 ---
 kind: pipeline
@@ -196,15 +172,14 @@ name: Deploy Pipeline
 workspace:
   path: /drone/grow
 
-# image_pull_secrets:
-# - from_secret: gitea_token
-
 steps:
 - name: Deploy Container
   image: docker
   privileged: true
   commands:
-    - docker compose build
+    - docker compose pull
+    - docker compose build --no-cache
+    - docker compose rm --stop
     - docker compose up --wait
   volumes:
   - name: env
@@ -231,21 +206,22 @@ steps:
       - failure
 
 volumes:
-- name: env
+- name: dockerconfig
   host:
-    path: /volume1/docker/labs/grow-auth/.env
+    path: /volume1/docker/dockerconfig.json
 - name: dockersock
   host:
     path: /var/run/docker.sock
-- name: dockerconfig
+- name: env
   host:
-    path: /volume1/docker/labs/grow-auth/dockerconfig.json
+    path: /volume1/docker/beethoven/labs-auth/staging.env
 
-# depends_on:
+depends_on:
-#   - Build Pipeline
+  - Test Pipeline
 
 trigger:
   branch:
   - main
-  # event:
+  event:
-  # - tag
+  - 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=localhost
+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=sso
+SERVICE_NAME=auth-service
+DB_TYPE=mongo

docker-compose.yml

@@ -2,29 +2,31 @@ 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
-            - 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
         volumes:
-            - '/volume1/docker/labs/grow-auth/mongo:/data/db'
+            - '/volume1/docker/labs/auth/mongo:/data/db'
         restart: unless-stopped
         image: mongo
     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_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,20 +37,18 @@ 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'
-            - 'traefik.http.routers.grow.service=gitea'
+            - 'traefik.http.routers.grow.service=grow-service'
-            - 'traefik.http.services.gitea.loadbalancer.server.port=${PORT}'
+            - 'traefik.http.services.grow-service.loadbalancer.server.port=${PORT}'
         networks:
             - docknet
-        volumes:
-            - '/Volume1/docker/.yarnrc.yml:/.yarnrc.yml'
-            - '/Volume1/docker/labs/grow-auth/.env:/.env'
         restart: unless-stopped
         image: node
+        links:
+            - auth-service_mongo:${CONTAINER_PREFIX:package}-auth-service_mongo
         depends_on:
             - auth-service_mongo
 networks:

package.json

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