Compare commits
10 Commits
1.0.6
...
6921bea5b5
| Author | SHA1 | Date | |
|---|---|---|---|
|
6921bea5b5
|
|||
|
ebe086e70f
|
|||
|
af943c1e84
|
|||
|
50af0b3065
|
|||
|
50e691cf05
|
|||
|
e706ef1924
|
|||
|
0ad99d3f0a
|
|||
|
bb7b15351d
|
|||
|
bc73ab271b
|
|||
|
b1b1f3e0b9
|
10
.drone.yml
10
.drone.yml
@@ -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
|
||||||
@@ -125,7 +126,9 @@ steps:
|
|||||||
repo: git.mifi.dev/mifi/auth-service
|
repo: git.mifi.dev/mifi/auth-service
|
||||||
registry: git.mifi.dev
|
registry: git.mifi.dev
|
||||||
build_args:
|
build_args:
|
||||||
NPM_TOKEN:
|
- MONGO_ENTRY_FILE=latest
|
||||||
|
- MONGO_VERSION=latest
|
||||||
|
- NPM_TOKEN:
|
||||||
from_secret: reg_token
|
from_secret: reg_token
|
||||||
ssh-agent-key:
|
ssh-agent-key:
|
||||||
from_secret: reg_token
|
from_secret: reg_token
|
||||||
@@ -167,8 +170,11 @@ depends_on:
|
|||||||
- Test Pipeline
|
- Test Pipeline
|
||||||
|
|
||||||
trigger:
|
trigger:
|
||||||
|
branch:
|
||||||
|
- main
|
||||||
event:
|
event:
|
||||||
- tag
|
# - tag
|
||||||
|
- push
|
||||||
|
|
||||||
---
|
---
|
||||||
kind: pipeline
|
kind: pipeline
|
||||||
|
|||||||
27
Dockerfile
27
Dockerfile
@@ -1,20 +1,23 @@
|
|||||||
ARG ENV=production
|
ARG ENV=production
|
||||||
ARG PORT=9001
|
ARG MONGO_ENTRY_FILE
|
||||||
|
ARG MONGO_VERSION=latest
|
||||||
ARG NPM_TOKEN
|
ARG NPM_TOKEN
|
||||||
|
ARG PORT=9001
|
||||||
ARG YARN_VERSION=3.5.0
|
ARG YARN_VERSION=3.5.0
|
||||||
ARG MONGO_ENTRY_FILE=${MONGO_VERSION:-latest}
|
|
||||||
ARG MONGO_VERSION=${MONGO_VERSION:-latest}
|
|
||||||
|
|
||||||
## mongo build stage
|
## mongo build stage
|
||||||
FROM mongo:$MONGO_VERSION AS database
|
FROM mongo:${MONGO_VERSION} AS database
|
||||||
ENV NODE_ENV $ENV
|
ENV NODE_ENV=${ENV}
|
||||||
COPY docker-entrypoint-initdb.d/mongo-init-$MONGO_ENTRY_FILE.sh ./docker-entrypoint-initdb.d/mongo-init.sh
|
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
|
||||||
@@ -24,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
|
||||||
|
|||||||
@@ -55,4 +55,4 @@ networks:
|
|||||||
|
|
||||||
volumes:
|
volumes:
|
||||||
auth-db:
|
auth-db:
|
||||||
external: false
|
external: true
|
||||||
|
|||||||
@@ -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:
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@mifi/auth-service",
|
"name": "@mifi/auth-service",
|
||||||
"version": "1.0.6",
|
"version": "1.0.11",
|
||||||
"author": "mifi (Mike Fitzpatrick)",
|
"author": "mifi (Mike Fitzpatrick)",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
|
|||||||
Reference in New Issue
Block a user