14 Commits

Author SHA1 Message Date
6921bea5b5 Lets try this... kickstart for the db...
All checks were successful
continuous-integration/drone/push Build is passing
2023-05-26 11:06:37 -04:00
ebe086e70f oops
All checks were successful
continuous-integration/drone/push Build is passing
2023-05-26 10:24:49 -04:00
af943c1e84 done test update 2023-05-26 10:22:07 -04:00
50af0b3065 Merge branch 'main' of ssh://git.mifi.dev:12022/mifi/auth-service
# Conflicts:
#	Dockerfile
2023-05-26 10:21:43 -04:00
50e691cf05 Why do I suck at Dockerfiles? 2023-05-26 10:17:36 -04:00
e706ef1924 Why do I suck at Dockerfiles? 2023-05-26 09:35:56 -04:00
0ad99d3f0a Maybe with ENV vars? 2023-05-26 09:13:02 -04:00
bb7b15351d More attempts at publishing... 2023-05-26 09:08:33 -04:00
bc73ab271b ugh 2023-05-25 13:30:17 -04:00
b1b1f3e0b9 Muahahahaha. Or not... 2023-05-25 13:08:14 -04:00
30c86accf6 Hmmm. 2023-05-25 13:00:16 -04:00
0882e8754e Incrementing versions we go... 2023-05-25 12:42:27 -04:00
73ac3d2dc6 Trying this... 2023-05-25 12:33:21 -04:00
5500a5644d Merge pull request 'Restructuring the folders' (#1) from develop into main
Reviewed-on: #1
2023-05-25 16:09:26 +00:00
7 changed files with 28 additions and 15 deletions

View File

@@ -91,6 +91,7 @@ steps:
commands: commands:
- yarn set version stable - yarn set version stable
- yarn install - yarn install
- yarn build:production
volumes: volumes:
- name: yarnrc - name: yarnrc
path: /drone/auth/.yarnrc.yml path: /drone/auth/.yarnrc.yml
@@ -124,6 +125,11 @@ steps:
auto_tag: true auto_tag: true
repo: git.mifi.dev/mifi/auth-service repo: git.mifi.dev/mifi/auth-service
registry: git.mifi.dev registry: git.mifi.dev
build_args:
- MONGO_ENTRY_FILE=latest
- MONGO_VERSION=latest
- NPM_TOKEN:
from_secret: reg_token
ssh-agent-key: ssh-agent-key:
from_secret: reg_token from_secret: reg_token
username: <token> username: <token>
@@ -164,8 +170,11 @@ depends_on:
- Test Pipeline - Test Pipeline
trigger: trigger:
branch:
- main
event: event:
- tag # - tag
- push
--- ---
kind: pipeline kind: pipeline

View File

@@ -1,18 +1,23 @@
ARG ENV=production ARG ENV=production
ARG MONGO_ENTRY_FILE
ARG MONGO_VERSION=latest ARG MONGO_VERSION=latest
ARG NPM_TOKEN
ARG PORT=9001 ARG PORT=9001
ARG NPM_TOKEN=not_set
ARG YARN_VERSION=3.5.0 ARG YARN_VERSION=3.5.0
## mongo build stage ## mongo build stage
FROM mongo:$MONGO_VERSION AS database FROM mongo:${MONGO_VERSION} AS database
COPY docker-entrypoint-initdb.d/mongo-init-$MONGO_VERSION.sh ./docker-entrypoint-initdb.d/mongo-init.sh ENV NODE_ENV=${ENV}
ARG MONGO_ENTRY_FILE=${MONGO_ENTRY_FILE:-latest}
ENV MONGO_VERSION=${MONGO_VERSION}
RUN echo ${MONGO_ENTRY_FILE} ${MONGO_VERSION} ${NODE_ENV}
COPY docker-entrypoint-initdb.d/mongo-init-${MONGO_ENTRY_FILE}.sh ./docker-entrypoint-initdb.d/mongo-init.sh
## stage one, build the service ## stage one, build the service
FROM node:20-bullseye-slim AS build FROM node:20-bullseye-slim AS build
ENV YARN_VERSION $YARN_VERSION ENV YARN_VERSION=${YARN_VERSION}
ENV NODE_ENV development ENV NODE_ENV=development
ENV NPM_TOKEN $NPM_TOKEN ENV NPM_TOKEN=${NPM_TOKEN}
WORKDIR /home/node/app WORKDIR /home/node/app
COPY .npmrc /root COPY .npmrc /root
COPY .build.yarnrc.yml /root/.yarnrc.yml COPY .build.yarnrc.yml /root/.yarnrc.yml
@@ -22,9 +27,9 @@ RUN yarn build:production
## this is stage two , where the app actually runs ## this is stage two , where the app actually runs
FROM node:20-bullseye-slim AS containerize FROM node:20-bullseye-slim AS containerize
ENV YARN_VERSION $YARN_VERSION ENV YARN_VERSION=${YARN_VERSION}
ENV NODE_ENV $ENV ENV NODE_ENV=${ENV}
ENV NPM_TOKEN $NPM_TOKEN ENV NPM_TOKEN=${NPM_TOKEN}
WORKDIR /home/node/app WORKDIR /home/node/app
COPY .npmrc /root COPY .npmrc /root
COPY .build.yarnrc.yml /root/.yarnrc.yml COPY .build.yarnrc.yml /root/.yarnrc.yml

View File

@@ -8,7 +8,7 @@ services:
context: . context: .
target: database target: database
args: args:
MONGO_VERSION: 6.0.5 MONGO_VERSION: latest
ports: ports:
- 27017:27017 - 27017:27017
networks: networks:

View File

@@ -55,4 +55,4 @@ networks:
volumes: volumes:
auth-db: auth-db:
external: false external: true

View File

@@ -9,7 +9,6 @@ services:
- docknet - docknet
volumes: volumes:
- auth-db:/data - auth-db:/data
- ./mongo-init.js:/docker-entrypoint-initdb.d/mongo-init.js:ro
restart: unless-stopped restart: unless-stopped
image: mongo:4.4 image: mongo:4.4
auth-service: auth-service:
@@ -31,7 +30,7 @@ services:
restart: unless-stopped restart: unless-stopped
depends_on: depends_on:
- auth-service_mongo - auth-service_mongo
image: git.mifi.dev/mifi/mifi/auth:latest image: git.mifi.dev/mifi/auth-service:latest
networks: networks:
docknet: docknet:

View File

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