6 Commits

Author SHA1 Message Date
f482750d08 this may break everything...
Some checks failed
continuous-integration/drone/push Build encountered an error
2023-05-05 08:47:54 -04:00
7b77df0c4c v0.0.13 - fixed triggers perhaps...
Some checks failed
continuous-integration/drone/push Build encountered an error
2023-05-05 08:32:17 -04:00
8ee5d627aa Resolving stupid errors
All checks were successful
continuous-integration/drone/push Build is passing
2023-05-05 08:21:02 -04:00
775dd60b56 Mostly passing pipelines, still a broken deploy... 2023-05-05 08:19:29 -04:00
b3365607c5 Muahahahha 2023-05-04 23:28:40 -04:00
96058995be New approach...
All checks were successful
continuous-integration/drone/push Build is passing
2023-05-04 23:19:45 -04:00
5 changed files with 21 additions and 42 deletions

View File

@@ -10,23 +10,19 @@ steps:
image: node:latest image: node:latest
commands: commands:
- yarn install - yarn install
- name: Code Style Checks - name: Code Style Checks
image: node:latest image: node:latest
commands: commands:
- yarn prettier - yarn prettier
- name: Lint - name: Lint
image: node:latest image: node:latest
commands: commands:
- yarn lint - yarn lint
- name: Unit Tests - name: Unit Tests
image: node:latest image: node:latest
commands: commands:
- yarn test - yarn test
- name: Send Test Status Notification
- name: Send Status Notification
image: plugins/webhook image: plugins/webhook
settings: settings:
urls: https://lab.mifi.dev/hooks/9p65zpagctgkmndo8nwwm4199r urls: https://lab.mifi.dev/hooks/9p65zpagctgkmndo8nwwm4199r
@@ -41,34 +37,14 @@ steps:
status: status:
- success - success
- failure - 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 - name: Build
image: node:latest image: node:latest
commands: commands:
- yarn build - yarn build
- name: Send Build Status Notifications
- 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/9p65zpagctgkmndo8nwwm4199r
content_type: application/json content_type: application/json
template: | template: |
{ {
@@ -81,13 +57,11 @@ steps:
- success - success
- failure - failure
depends_on:
- Test Pipeline
trigger: trigger:
branch: branch:
- main - main
event: event:
- pull_request
- push - push
--- ---
@@ -100,7 +74,7 @@ workspace:
path: /drone/grow path: /drone/grow
steps: steps:
- name: Build Service - name: Build Package
image: node:latest image: node:latest
commands: commands:
- yarn install - yarn install
@@ -117,7 +91,8 @@ steps:
token: token:
- from_secret: gitea_token - from_secret: gitea_token
volumes: volumes:
- name: yarnrc - name: npmrc
path: /drone/grow/.npmrc
- name: Report NPM Publish Status - name: Report NPM Publish Status
image: plugins/webhook image: plugins/webhook
settings: settings:
@@ -175,15 +150,18 @@ volumes:
- name: dockersock - name: dockersock
host: host:
path: /var/run/docker.sock path: /var/run/docker.sock
- name: yarnrc - name: npmrc
host: host:
path: /volume1/docker/.yarnrc.yml path: /volume1/docker/grow/labs-auth/.npmrc
depends_on: depends_on:
- Build Pipeline - Test Pipeline
trigger: trigger:
branch:
- main
event: event:
- push
- tag - tag
--- ---
@@ -199,7 +177,9 @@ steps:
image: docker image: docker
privileged: true privileged: true
commands: commands:
- docker compose pull
- docker compose build --no-cache - docker compose build --no-cache
- docker compose rm --stop .
- docker compose up --wait - docker compose up --wait
volumes: volumes:
- name: env - name: env
@@ -237,8 +217,11 @@ volumes:
path: /volume1/docker/labs/grow-auth/.env path: /volume1/docker/labs/grow-auth/.env
depends_on: depends_on:
- Build Pipeline - Test Pipeline
trigger: trigger:
branch:
- main
event: event:
- push
- tag - tag

3
.npmrc
View File

@@ -1,3 +0,0 @@
@mifi:registry=https://git.mifi.dev/api/packages/mifi/npm
//git.mifi.dev/api/packages/mifi/npm/:_authToken=${NPM_TOKEN}
@mifi/grow:registry=https://git.mifi.dev

View File

@@ -23,5 +23,4 @@ WORKDIR /home/node/app
COPY package*.json ./ COPY package*.json ./
RUN yarn install --frozen-lockfile --production RUN yarn install --frozen-lockfile --production
COPY --from=0 /home/node/app/dist . COPY --from=0 /home/node/app/dist .
EXPOSE 80
CMD ["node","server/index.js"] CMD ["node","server/index.js"]

View File

@@ -22,7 +22,7 @@ services:
- ROUTE_PREFIX=${ROUTE_PREFIX} - ROUTE_PREFIX=${ROUTE_PREFIX}
- LOGIN_ROUTE=${LOGIN_ROUTE} - LOGIN_ROUTE=${LOGIN_ROUTE}
- RESET_ROUTE=${RESET_ROUTE} - RESET_ROUTE=${RESET_ROUTE}
- DB_HOST=${CONTAINER_PREFIX}-${SERVICE_NAME}_${DB_TYPE} - DB_HOST=${SERVICE_NAME}_${DB_TYPE}
- DB_USER=${DB_USER} - DB_USER=${DB_USER}
- DB_PASS=${DB_PASS} - DB_PASS=${DB_PASS}
- DB_NAME=${DB_NAME} - DB_NAME=${DB_NAME}

View File

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