Updates

.drone.yml

@@ -95,33 +95,57 @@ kind: pipeline
 type: docker
 name: Deploy Pipeline
 
-platform:  
+workspace:
-  os: linux  
+  path: /drone/grow
-  arch: arm64
 
 steps:
-- name: yarn-install
+- name: Build Container
-  image: node
+  image: node:latest
   commands:
-    - cd /app
+    - cp /drone/grow/package.json ./
-    - cp /drone/src/package.json ./
+    - cp /drone/grow/yarn.lock ./
-    - cp /drone/src/yarn.lock ./
     - yarn install --frozen-lockfile
-    - cp -r /drone/src/* .
+    - cp -r /drone/grow/* .
     - yarn build
-  volumes:
-    - name: app-build-dir
-  path: /app-build
 - name: Deploy Container
-  image: compose
+  image: docker
   commands:
-    - cd /app
+    - compose build .
-    - cp /app-build-dir/* .
+    - compose up -d
-    - build
-    - up -d
   volumes:
-    - name: app-build-dir
+  - name: env
-  path: /app-build
+    path: ./.env
-  volumes:
+  - name: dockersock
-    - name: app-build-dir
+    Path: /var/run/docker.sock
-      temp: {}
+- 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 }}] Deploy {{ build.status }} {{#success build.status}}:tada:{{else}}:poop:{{/success}}",
+        "username":"DroneBot"
+      }
+  when:
+    status:
+      - success
+      - failure
+
+volumes:
+- name: env
+  host: 
+    path: /volume1/docker/labs/grow-auth/.env
+- name: dockersock
+  host:
+    path: /var/run/docker.sock
+
+depends_on:
+  - Build Pipeline
+
+trigger:
+  branch:
+  - main
+  event:
+  - push

Dockerfile

@@ -1,7 +1,2 @@
-FROM node:latest
+FROM node
-WORKDIR /app
+CMD ["node", "dist/lib/server/index.js"]
-COPY package.json .
-RUN yarn install
-COPY . .
-RUN yarn build
-CMD ["node", "dist/lib/server/index.js"]

docker-compose.yml

@@ -2,29 +2,30 @@ version: '3.8'
 
 services:
     auth-service_mongo:
-        container_name: ${CONTAINER_PREFIX}auth-service_mongo
+        container_name: ${CONTAINER_PREFIX}${SERVICE_NAME}_${DB_TYPE}
         environment:
             - ALLOW_EMPTY_PASSWORD=yes
-            - MONGODB_USERNAME=${DB_USER}
+            - MONGO_INITDB_ROOT_USERNAME=${DB_USER}
-            - MONGODB_PASSWORD=${DB_PASS}
+            - MONGO_INITDB_ROOT_PASSWORD=${DB_PASS}
-            - MONGODB_DATABASE=${DB_NAME}
+            - MONGO_INITDB_DATABASE=${DB_NAME}
         networks:
             - docknet
         volumes:
             - '/volume1/docker/labs/grow-auth/mongo:/data/db'
-            - '/Volume1/docker/labs/grow-auth/.env:./.env'
+            # - '/var/tmp/grow/mongo:/data/db'
         restart: unless-stopped
         image: mongo
     auth-service:
-        container_name: ${CONTAINER_PREFIX}auth-service
+        build: .
+        container_name: ${CONTAINER_PREFIX}-${SERVICE_NAME}
         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}-${SERVICE_NAME}_${DB_TYPE}
             - DB_USER=${DB_USER}
-            - DB_PASSWORD=${DB_PASS}
+            - DB_PASS=${DB_PASS}
             - DB_NAME=${DB_NAME}
             - SESSION_KEY=${SESSION_KEY}
             - JWT_AUDIENCE=${JWT_AUDIENCE}
@@ -45,8 +46,9 @@ services:
         networks:
             - docknet
         volumes:
-            - '/Volume1/docker/.yarnrc.yml:./.yarnrc.yml'
+            - '/Volume1/docker/.yarnrc.yml:/.yarnrc.yml'
-            - '/Volume1/docker/labs/grow-auth/.env:./.env'
+            - '/Volume1/docker/labs/grow-auth/.env:/.env'
+            # - '~/Projects/Grow/auth/.env:/.env'
         restart: unless-stopped
         image: node
         depends_on: