More changes

.drone.yml

@@ -10,23 +10,19 @@ steps:
   image: node:latest
   commands:
   - 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 Status Notification
+- name: Send Test Status Notification
   image: plugins/webhook
   settings:
     urls: https://lab.mifi.dev/hooks/9p65zpagctgkmndo8nwwm4199r
@@ -41,34 +37,14 @@ steps:
     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
+- name: Send Build Status Notifications
   image: plugins/webhook
   settings:
-    urls: https://lab.mifi.dev/hooks/ccw34hdf7tgbjmzp96nptn938r
+    urls: https://lab.mifi.dev/hooks/9p65zpagctgkmndo8nwwm4199r
     content_type: application/json
     template: |
       {
@@ -81,54 +57,43 @@ steps:
       - success
       - failure
 
-depends_on:
-  - Test Pipeline
-
 trigger:
   branch:
   - main
   event:
+  - pull_request
   - push
 
 ---
 kind: pipeline
 type: docker
 name: Publish Pipeline
+group: publish
 
 workspace:
   path: /drone/grow
 
 steps:
-- name: Build Service
+- name: Build Package
   image: node:latest
   commands:
-    - cp /drone/grow/package.json ./
-    - cp /drone/grow/yarn.lock ./
-    - yarn install --frozen-lockfile
-    - cp -r /drone/grow/* .
+    - yarn install
     - yarn build
 - name: Publish NPM
   image: plugins/npm
+  failure: ignore
   settings:
-    username: mifi
-    registry: git.mifi.dev
+    username:
+      from_secret: registry_username
+    password:
+      from_secret: registry_password
+    registry: https://git.mifi.dev
     token:
     - from_secret: gitea_token
-- name: Publish Image
-  image: plugins/docker
-  settings:
-    auto_tag: true
-    squash: true
-    repo: git.mifi.dev/mifi/auth
-    registry: git.mifi.dev
-    ssh-agent-key:
-      from_secret: gitea_token
   volumes:
-  - name: dockersock
-    Path: /var/run/docker.sock
-  - name: dockerconfig
-    Path: /.docker/config.json
-- name: Send Status Notifications
+  - name: npmrc
+    path: /drone/grow/.npmrc
+- name: Report NPM Publish Status
   image: plugins/webhook
   settings:
     urls: https://lab.mifi.dev/hooks/ccw34hdf7tgbjmzp96nptn938r
@@ -136,7 +101,41 @@ steps:
     template: |
       {
         "icon_url":"https://emojipedia-us.s3.dualstack.us-west-1.amazonaws.com/thumbs/120/apple/198/freezing-face_1f976.png",
-        "text": "[{{ repo.name }} - New tagged docker image release {{tag}} from # {{ build.number }}] Deploy {{ build.status }} {{#success build.status}}:tada:{{else}}:poop:{{/success}}",
+        "text": "[{{ repo.name }} - New npm package release {{tag}} from # {{ build.number }}] Deploy {{ build.status }} {{#success build.status}}:tada:{{else}}:poop:{{/success}}",
+        "username":"DroneBot"
+      }
+  when:
+    status:
+      - success
+      - failure
+- name: Publish Image
+  image: plugins/docker
+  settings:
+    auto_tag: true
+    squash: true
+    repo: git.mifi.dev/mifi/auth
+    context: mifi
+    registry: git.mifi.dev
+    username:
+      from_secret: registry_username
+    password:
+      from_secret: registry_password
+    ssh-agent-key:
+      from_secret: gitea_token
+  volumes:
+  - name: dockersock
+    path: /var/run/docker.sock
+  - name: dockerconfig
+    path: /drone/grow/.docker/config.json
+- name: Report Image Publish Status
+  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 }} - New docker image release {{tag}} from # {{ build.number }}] Deploy {{ build.status }} {{#success build.status}}:tada:{{else}}:poop:{{/success}}",
         "username":"DroneBot"
       }
   when:
@@ -145,16 +144,24 @@ steps:
       - failure
 
 volumes:
-- name: dockersock
-  path: /var/run/docker.sock
 - name: dockerconfig
-  path: /volume1/docker/labs/grow-auth/dockerconfig.json
+  host:
+    path: /volume1/docker/dockerconfig.json
+- name: dockersock
+  host:
+    path: /var/run/docker.sock
+- name: npmrc
+  host:
+    path: /volume1/docker/grow/labs-auth/.npmrc
 
 depends_on:
-  - Build Pipeline
+  - Test Pipeline
 
 trigger:
+  branch:
+  - main
   event:
+  - push
   - tag
 
 ---
@@ -165,24 +172,25 @@ name: Deploy Pipeline
 workspace:
   path: /drone/grow
 
-# image_pull_secrets:
-# - from_secret: gitea_token
-
 steps:
 - name: Deploy Container
   image: docker
+  privileged: true
   commands:
-    - compose build .
-    - compose up --wait
+    - docker compose pull
+    - docker compose build --no-cache
+    - docker compose rm --stop
+    - docker compose up --wait
   volumes:
   - name: env
-    path: /.env
+    path: /drone/grow/.env
   - name: dockersock
-    Path: /var/run/docker.sock
+    path: /var/run/docker.sock
   - name: dockerconfig
-    Path: /.docker/config.json
+    path: /drone/grow/.docker/config.json
 - name: Send Status Notifications
   image: plugins/webhook
+  privileged: true
   settings:
     urls: https://lab.mifi.dev/hooks/ccw34hdf7tgbjmzp96nptn938r
     content_type: application/json
@@ -198,16 +206,22 @@ steps:
       - failure
 
 volumes:
-- name: env
-  path: /volume1/docker/labs/grow-auth/.env
-- name: dockersock
-  path: /var/run/docker.sock
 - name: dockerconfig
-  path: /volume1/docker/labs/grow-auth/dockerconfig.json
+  host:
+    path: /volume1/docker/dockerconfig.json
+- name: dockersock
+  host:
+    path: /var/run/docker.sock
+- name: env
+  host:
+    path: /volume1/docker/labs/grow-auth/.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

@@ -2,11 +2,12 @@ version: '3.8'
 
 services:
     auth-service_mongo:
-        container_name: ${CONTAINER_PREFIX}${SERVICE_NAME}_${DB_TYPE}
+        container_name: ${CONTAINER_PREFIX}-${SERVICE_NAME}_${DB_TYPE}
+        env_file: staging.env
         environment:
             - ALLOW_EMPTY_PASSWORD=yes
-            - MONGO_INITDB_ROOT_USERNAME=${DB_USER}
-            - MONGO_INITDB_ROOT_PASSWORD=${DB_PASS}
+            - MONGO_INITDB_ROOT_USERNAME=${DB_USERNAME}
+            - MONGO_INITDB_ROOT_PASSWORD=${DB_PASSWORD}
             - MONGO_INITDB_DATABASE=${DB_NAME}
         networks:
             - docknet
@@ -15,24 +16,25 @@ services:
         restart: unless-stopped
         image: mongo
     auth-service:
+        env_file: staging.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_USER}
-            - DB_PASS=${DB_PASS}
-            - 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}`)'
@@ -44,11 +46,10 @@ services:
             - 'traefik.http.services.gitea.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}-${SERVICE_NAME}_${DB_TYPE}
         depends_on:
             - auth-service_mongo
 networks:

package.json

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