3 Commits

Author SHA1 Message Date
adcab6afcb Double dollar
Some checks failed
continuous-integration/drone/push Build encountered an error
2023-05-06 09:28:24 -04:00
8e40c0a06c Tweaking the ENV
Some checks failed
continuous-integration/drone/push Build encountered an error
2023-05-06 09:19:31 -04:00
db5e4858b8 More ENV updates
Some checks failed
continuous-integration/drone/push Build was killed
2023-05-06 09:10:45 -04:00
3 changed files with 18 additions and 12 deletions

View File

@@ -110,7 +110,13 @@ steps:
- failure - failure
- name: Publish Image - name: Publish Image
image: docker image: docker
environment:
USERNAME:
from_secret: registry_username
PASSWORD:
from_secret: registry_password
commands: commands:
- docker login -u ${USERNAME} -p {PASSWORD} git.mifi.dev
- docker build -t git.mifi.dev/mifi/mifi/auth:latest -t git.mifi.dev/mifi/mifi/auth:${DRONE_TAG} . - docker build -t git.mifi.dev/mifi/mifi/auth:latest -t git.mifi.dev/mifi/mifi/auth:${DRONE_TAG} .
- docker push git.mifi.dev/mifi/mifi/auth:latest - docker push git.mifi.dev/mifi/mifi/auth:latest
volumes: volumes:
@@ -192,8 +198,8 @@ steps:
- docker compose -f docker-compose.staging.yml rm --stop - docker compose -f docker-compose.staging.yml rm --stop
- docker compose -f docker-compose.staging.yml up --wait - docker compose -f docker-compose.staging.yml up --wait
volumes: volumes:
- name: env - name: env-secrets
path: /drone/grow/staging.env path: /drone/grow/staging.secrets.env
- name: dockersock - name: dockersock
path: /var/run/docker.sock path: /var/run/docker.sock
- name: dockerconfig - name: dockerconfig
@@ -222,9 +228,9 @@ volumes:
- name: dockersock - name: dockersock
host: host:
path: /var/run/docker.sock path: /var/run/docker.sock
- name: env - name: env-secrets
host: host:
path: /volume1/docker/beethoven/labs-auth/staging.env path: /volume1/docker/beethoven/labs-auth/staging.secrets.env
depends_on: depends_on:
- Test Pipeline - Test Pipeline

View File

@@ -2,10 +2,10 @@ version: '3.8'
services: services:
auth-service_mongo: auth-service_mongo:
container_name: ${CONTAINER_PREFIX:-mifi}-auth-service_mongo container_name: $${CONTAINER_PREFIX:-mifi}-auth-service_mongo
env_file: env_file:
- .env.staging - .env.staging
- staging.env - staging.secrets.env
networks: networks:
- docknet - docknet
volumes: volumes:
@@ -15,19 +15,19 @@ services:
auth-service: auth-service:
env_file: env_file:
- .env.staging - .env.staging
- staging.env - staging.secrets.env
build: . build: .
container_name: ${CONTAINER_PREFIX:-mifi}-auth-service container_name: $${CONTAINER_PREFIX:-mifi}-auth-service
environment: environment:
- DB_HOST=${CONTAINER_PREFIX:-mifi}-auth-service_mongo - DB_HOST=$${CONTAINER_PREFIX:-mifi}-auth-service_mongo
labels: labels:
- 'traefik.enable=true' - 'traefik.enable=true'
- 'traefik.http.routers.grow.rule=Host(`${HOST}`) && Path(`${ROUTE_PREFIX}`)' - 'traefik.http.routers.grow.rule=Host(`$${HOST}`) && Path(`$${ROUTE_PREFIX}`)'
- 'traefik.http.routers.grow.entrypoints=websecure' - 'traefik.http.routers.grow.entrypoints=websecure'
- 'traefik.http.routers.grow.tls=true' - 'traefik.http.routers.grow.tls=true'
- 'traefik.http.routers.grow.tls.certresolver=letsencrypt' - 'traefik.http.routers.grow.tls.certresolver=letsencrypt'
- 'traefik.http.routers.grow.service=grow-service' - 'traefik.http.routers.grow.service=grow-service'
- 'traefik.http.services.grow-service.loadbalancer.server.port=${PORT}' - 'traefik.http.services.grow-service.loadbalancer.server.port=$${PORT}'
networks: networks:
- docknet - docknet
restart: unless-stopped restart: unless-stopped

View File

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