From c2d9f8be5adb569ec3254a4bdd389ecf3aefbe78 Mon Sep 17 00:00:00 2001
From: mifi <badmf@mifi.dev>
Date: Thu, 4 May 2023 11:17:52 -0400
Subject: [PATCH] Update to v 0.0.4

---
 .drone.yml         | 45 ++++++++++++++++-----------------------------
 Dockerfile         | 29 +++++++++++++++++++++++++++--
 docker-compose.yml |  2 --
 package.json       |  3 ++-
 tsconfig.json      |  2 +-
 5 files changed, 46 insertions(+), 35 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index f6e902a..8bdda62 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -107,7 +107,6 @@ steps:
     - yarn install --frozen-lockfile
     - cp -r /drone/grow/* .
     - yarn build
-
 - name: Publish NPM
   image: plugins/npm
   settings:
@@ -115,21 +114,15 @@ steps:
     registry: git.mifi.dev
     token:
     - from_secret: gitea_token
-
-- name: Build Image
-  image: docker
-  commands:
-    - docker compose build
-
 - 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
-
 - name: Send Status Notifications
   image: plugins/webhook
   settings:
@@ -167,24 +160,16 @@ workspace:
 # - from_secret: gitea_token
 
 steps:
-- name: Build Container
-  image: node:latest
-  commands:
-    - cp /drone/grow/package.json ./
-    - cp /drone/grow/yarn.lock ./
-    - yarn install --frozen-lockfile
-    - cp -r /drone/grow/* .
-    - yarn build
 - name: Deploy Container
   image: docker
   commands:
     - compose build .
     - compose up -d
-  volumes:
-  - name: env
-    path: ./.env
-  - name: dockersock
-    Path: /var/run/docker.sock
+  # volumes:
+  # - name: env
+  #   path: ./.env
+  # - name: dockersock
+  #   Path: /var/run/docker.sock
 - name: Send Status Notifications
   image: plugins/webhook
   settings:
@@ -202,6 +187,16 @@ steps:
       - failure
 
 volumes:
+  - /volume1/docker/labs/grow-auth/.env:.env
+  - /var/run/docker.sock:/var/run/docker.sock
+  - /volume1/docker/labs/grow-auth/dockerconfig.json:.docker/config.json
+
+# - name: env
+#   host: 
+#     path: /volume1/docker/labs/grow-auth/.env
+# - name: dockersock
+#   host:
+#     path: /var/run/docker.sock
 
 depends_on:
   - Build Pipeline
@@ -211,11 +206,3 @@ trigger:
   - main
   event:
   - tag
-
-
-- name: env
-  host: 
-    path: /volume1/docker/labs/grow-auth/.env
-- name: dockersock
-  host:
-    path: /var/run/docker.sock
diff --git a/Dockerfile b/Dockerfile
index 7acafa4..9bd6656 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,2 +1,27 @@
-FROM node
-CMD ["node", "dist/lib/server/index.js"]
+# FROM node:20-alpine AS build
+# RUN mkdir -p /home/node/app/node_modules && chown -R node:node /home/node/app
+# WORKDIR /home/node/app
+# COPY package*.json .
+# COPY dist/lib .
+# USER node
+# RUN yarn install --frozen-lockfile --production
+# COPY --chown=node:node node_modules ./node_modules
+# CMD ["node", "dist/lib/server/index.js"]
+
+FROM node:20-alpine AS build
+WORKDIR /home/node/app
+COPY package*.json ./
+COPY tsconfig.json ./
+COPY lib ./lib
+RUN ls -a
+RUN yarn install
+RUN yarn build:production
+
+## this is stage two , where the app actually runs
+FROM node:20-alpine AS containerize
+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"]
diff --git a/docker-compose.yml b/docker-compose.yml
index 62a22b3..bb787c2 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -12,7 +12,6 @@ services:
             - docknet
         volumes:
             - '/volume1/docker/labs/grow-auth/mongo:/data/db'
-            # - '/var/tmp/grow/mongo:/data/db'
         restart: unless-stopped
         image: mongo
     auth-service:
@@ -48,7 +47,6 @@ services:
         volumes:
             - '/Volume1/docker/.yarnrc.yml:/.yarnrc.yml'
             - '/Volume1/docker/labs/grow-auth/.env:/.env'
-            # - '~/Projects/Grow/auth/.env:/.env'
         restart: unless-stopped
         image: node
         depends_on:
diff --git a/package.json b/package.json
index eb62412..d1c437a 100644
--- a/package.json
+++ b/package.json
@@ -1,10 +1,11 @@
 {
   "name": "@mifi/auth",
-  "version": "0.0.3",
+  "version": "0.0.4",
   "author": "mifi (Mike Fitzpatrick)",
   "license": "MIT",
   "scripts": {
     "build": "tsc",
+    "build:production": "tsc -p .",
     "format": "prettier:fix && lint:fix",
     "lint": "eslint --ext .ts,.tsx lib/",
     "lint:fix": "eslint --fix --ext .ts,.tsx lib/",
diff --git a/tsconfig.json b/tsconfig.json
index b6a37c7..bdb6755 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -6,7 +6,7 @@
         "emitDecoratorMetadata": true,
         "noImplicitAny": true,
         "outDir": "./dist/",
-        "rootDirs": ["lib", "../"],
+        "rootDirs": ["lib"],
         "sourceMap": true
     }
 }