45 Commits

Author SHA1 Message Date
1a717cd83e Not likely....
Some checks failed
continuous-integration/drone/push Build encountered an error
2023-05-04 21:49:37 -04:00
1e932d97c8 Probably not 2023-05-04 21:43:58 -04:00
d879de2a6b Maybe a fix for the volume syntax?
Some checks failed
continuous-integration/drone/push Build is failing
2023-05-04 21:41:00 -04:00
34e3eb04af Ooops
Some checks failed
continuous-integration/drone/push Build is failing
continuous-integration/drone Build is failing
2023-05-04 21:31:16 -04:00
ff5f88588e Auth? 2023-05-04 21:30:25 -04:00
ac5c09b7da Or maybe add the registry to the package.json...
Some checks failed
continuous-integration/drone/push Build is failing
2023-05-04 21:17:59 -04:00
d1b42fe79f Remove registry from package.json
Some checks failed
continuous-integration/drone/push Build is failing
2023-05-04 21:13:01 -04:00
3d32c77bd1 That command never played nice...
Some checks failed
continuous-integration/drone/push Build is failing
2023-05-04 21:05:57 -04:00
8e077810f5 Maybe these path changes will do the trick fixing the volume issues
Some checks are pending
continuous-integration/drone/push Build is running
2023-05-04 21:04:29 -04:00
5e0621e37d Copy env into workspace?
Some checks failed
continuous-integration/drone/push Build is failing
2023-05-04 20:59:54 -04:00
e6f9f9b523 Fix naming collision
Some checks failed
continuous-integration/drone/push Build is failing
2023-05-04 20:53:13 -04:00
1c5fdabca6 Recombine Steps
Some checks failed
continuous-integration/drone/push Build encountered an error
2023-05-04 20:48:13 -04:00
7bbb4bb036 A bit more...
Some checks failed
continuous-integration/drone/push Build is failing
2023-05-04 20:39:38 -04:00
159f87d07e HOST!
Some checks failed
continuous-integration/drone/push Build is failing
2023-05-04 20:36:07 -04:00
244db86113 Trying with the .env file copied in
Some checks failed
continuous-integration/drone/push Build is failing
2023-05-04 20:27:29 -04:00
00d9a4f734 Rollback!
Some checks failed
continuous-integration/drone/push Build is failing
2023-05-04 20:21:15 -04:00
b7a3c12eff again
Some checks are pending
continuous-integration/drone/push Build is running
2023-05-04 19:57:25 -04:00
8e263d7ace Rollback 2023-05-04 19:54:36 -04:00
641cbcfd47 but why?
Some checks are pending
continuous-integration/drone/push Build is running
2023-05-04 19:51:44 -04:00
8af84d42e5 Broken?
Some checks are pending
continuous-integration/drone/push Build is running
2023-05-04 19:44:57 -04:00
d31a47f46c This!
Some checks are pending
continuous-integration/drone/push Build is running
2023-05-04 19:42:30 -04:00
ddb8ad0948 Or...
Some checks failed
continuous-integration/drone/push Build is failing
2023-05-04 19:40:33 -04:00
73cb0c23f5 Or this?
Some checks failed
continuous-integration/drone/push Build is failing
2023-05-04 19:37:08 -04:00
59738f5711 Hmmm...
Some checks failed
continuous-integration/drone/push Build is failing
2023-05-04 19:33:52 -04:00
f3ff19098b privileged
Some checks failed
continuous-integration/drone/push Build is failing
2023-05-04 12:28:32 -04:00
8bc852fa7d Secrets! 2023-05-04 12:26:23 -04:00
8e06b98695 Parallel publishing
Some checks failed
continuous-integration/drone/push Build is failing
2023-05-04 12:15:59 -04:00
809255baa6 Last try before lunch
Some checks failed
continuous-integration/drone/push Build is failing
2023-05-04 12:12:44 -04:00
21e80ca883 try dind
Some checks failed
continuous-integration/drone/push Build is failing
2023-05-04 12:09:53 -04:00
cfb7c7e453 Do the things. Again.
Some checks failed
continuous-integration/drone/push Build is failing
2023-05-04 12:04:53 -04:00
82498e7714 not frozen
Some checks failed
continuous-integration/drone/push Build is failing
2023-05-04 11:44:52 -04:00
87a611459a ...
Some checks failed
continuous-integration/drone/push Build is failing
2023-05-04 11:43:02 -04:00
0a09208766 ... 2023-05-04 11:42:32 -04:00
99ce364dc4 Ugh 2023-05-04 11:41:54 -04:00
2daa33f3ac Still can't publish or deploy... 2023-05-04 11:41:16 -04:00
2814c6820b Perhaps...
Some checks failed
continuous-integration/drone/push Build is failing
2023-05-04 11:32:09 -04:00
d9cafe009d Pipeline triggers 2023-05-04 11:28:12 -04:00
d011f15136 - Resolve version number issue
All checks were successful
continuous-integration/drone/push Build is passing
2023-05-04 11:25:58 -04:00
ee398feeb9 Update pipelines
Some checks are pending
continuous-integration/drone/push Build is running
2023-05-04 11:23:28 -04:00
c2d9f8be5a Update to v 0.0.4 2023-05-04 11:17:52 -04:00
5f69193b81 Annoying ass shit 2023-05-03 23:07:44 -04:00
2a13a433e1 this 2023-05-03 23:06:37 -04:00
b094ae2c9a Deploy 2023-05-03 23:00:55 -04:00
e48037a7d4 Tweaks 2023-05-03 22:57:22 -04:00
ecfa12154d Up version / publish 2023-05-03 22:37:21 -04:00
5 changed files with 212 additions and 87 deletions

View File

@@ -1,71 +1,125 @@
# kind: pipeline
# type: docker
# name: Test Pipeline
# workspace:
# path: /drone/grow
# steps:
# - name: yarn install
# 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
# 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 kind: pipeline
type: docker type: docker
name: Test Pipeline name: Publish Pipeline
group: publish
workspace: workspace:
path: /drone/grow path: /drone/grow
steps: steps:
- name: yarn install - name: Build Service
image: node:latest image: node:latest
commands: commands:
- yarn install - yarn install
- yarn build
- name: Code Style Checks - name: Publish NPM
image: node:latest image: plugins/npm
commands: failure: ignore
- yarn prettier
- 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: settings:
urls: https://lab.mifi.dev/hooks/9p65zpagctgkmndo8nwwm4199r username:
content_type: application/json from_secret: registry_username
template: | password:
{ from_secret: registry_password
"icon_url":"https://emojipedia-us.s3.dualstack.us-west-1.amazonaws.com/thumbs/120/apple/198/freezing-face_1f976.png", registry: https://git.mifi.dev
"text": "[{{ repo.name }} - Build # {{ build.number }}] Code Quality Checks {{ build.status }} {{#success build.status}}:tada:{{else}}:poop:{{/success}}", token:
"username":"DroneBot" - from_secret: gitea_token
} volumes:
when: - name: yarnrc
status: path: /drone/grow/.yarnrc.yml
- success - name: Report NPM Publish Status
- 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 image: plugins/webhook
settings: settings:
urls: https://lab.mifi.dev/hooks/ccw34hdf7tgbjmzp96nptn938r urls: https://lab.mifi.dev/hooks/ccw34hdf7tgbjmzp96nptn938r
@@ -73,7 +127,40 @@ steps:
template: | template: |
{ {
"icon_url":"https://emojipedia-us.s3.dualstack.us-west-1.amazonaws.com/thumbs/120/apple/198/freezing-face_1f976.png", "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}}", "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
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" "username":"DroneBot"
} }
when: when:
@@ -81,14 +168,25 @@ steps:
- success - success
- failure - failure
depends_on: volumes:
- Test Pipeline - name: yarnrc
host:
path: /Volume1/docker/.yarnrc.yml
- name: dockersock
host:
path: /var/run/docker.sock
- name: dockerconfig
host:
path: /volume1/docker/labs/grow-auth/dockerconfig.json
# depends_on:
# - Build Pipeline
trigger: trigger:
branch: branch:
- main - main
event: # event:
- push # - tag
--- ---
kind: pipeline kind: pipeline
@@ -98,27 +196,26 @@ name: Deploy Pipeline
workspace: workspace:
path: /drone/grow path: /drone/grow
# image_pull_secrets:
# - from_secret: gitea_token
steps: 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 - name: Deploy Container
image: docker image: docker
privileged: true
commands: commands:
- compose build . - docker compose build
- compose up -d - docker compose up --wait
volumes: volumes:
- name: env - name: env
path: ./.env path: /drone/grow/.env
- name: dockersock - name: dockersock
Path: /var/run/docker.sock path: /var/run/docker.sock
- name: dockerconfig
path: /drone/grow/.docker/config.json
- name: Send Status Notifications - name: Send Status Notifications
image: plugins/webhook image: plugins/webhook
privileged: true
settings: settings:
urls: https://lab.mifi.dev/hooks/ccw34hdf7tgbjmzp96nptn938r urls: https://lab.mifi.dev/hooks/ccw34hdf7tgbjmzp96nptn938r
content_type: application/json content_type: application/json
@@ -135,17 +232,20 @@ steps:
volumes: volumes:
- name: env - name: env
host: host:
path: /volume1/docker/labs/grow-auth/.env path: /volume1/docker/labs/grow-auth/.env
- name: dockersock - name: dockersock
host: host:
path: /var/run/docker.sock path: /var/run/docker.sock
- name: dockerconfig
host:
path: /volume1/docker/labs/grow-auth/dockerconfig.json
depends_on: # depends_on:
- Build Pipeline # - Build Pipeline
trigger: trigger:
branch: branch:
- main - main
event: # event:
- push # - tag

View File

@@ -1,2 +1,27 @@
FROM node # FROM node:20-alpine AS build
CMD ["node", "dist/lib/server/index.js"] # 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"]

View File

@@ -12,7 +12,6 @@ services:
- docknet - docknet
volumes: volumes:
- '/volume1/docker/labs/grow-auth/mongo:/data/db' - '/volume1/docker/labs/grow-auth/mongo:/data/db'
# - '/var/tmp/grow/mongo:/data/db'
restart: unless-stopped restart: unless-stopped
image: mongo image: mongo
auth-service: auth-service:
@@ -48,7 +47,6 @@ services:
volumes: 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 restart: unless-stopped
image: node image: node
depends_on: depends_on:

View File

@@ -1,10 +1,11 @@
{ {
"name": "@mifi/auth", "name": "@mifi/auth",
"version": "0.0.2", "version": "0.0.7",
"author": "mifi (Mike Fitzpatrick)", "author": "mifi (Mike Fitzpatrick)",
"license": "MIT", "license": "MIT",
"scripts": { "scripts": {
"build": "tsc", "build": "tsc",
"build:production": "tsc -p .",
"format": "prettier:fix && lint:fix", "format": "prettier:fix && lint:fix",
"lint": "eslint --ext .ts,.tsx lib/", "lint": "eslint --ext .ts,.tsx lib/",
"lint:fix": "eslint --fix --ext .ts,.tsx lib/", "lint:fix": "eslint --fix --ext .ts,.tsx lib/",
@@ -79,5 +80,6 @@
"repository": { "repository": {
"type": "git", "type": "git",
"url": "https://git.mifi.dev/mifi/auth.git" "url": "https://git.mifi.dev/mifi/auth.git"
} },
"registry": "https://git.mifi.dev"
} }

View File

@@ -6,7 +6,7 @@
"emitDecoratorMetadata": true, "emitDecoratorMetadata": true,
"noImplicitAny": true, "noImplicitAny": true,
"outDir": "./dist/", "outDir": "./dist/",
"rootDirs": ["lib", "../"], "rootDirs": ["lib"],
"sourceMap": true "sourceMap": true
} }
} }