2
0
Fork 0

Merge branch 'feat/adding-bio-and-profile-pic-support'
continuous-integration/drone/push Build is failing Details

pull/15/head
Daniel Lim 2019-06-21 09:08:14 +08:00
commit 2260db7004
7 changed files with 56 additions and 1 deletions

2
.gitignore vendored
View File

@ -1 +1,3 @@
node_modules/
files/*
!files/.gitkeep

3
.gitmodules vendored
View File

@ -31,3 +31,6 @@
[submodule "backend-auth"]
path = backend-auth
url = git@makerforce.io:beep/backend-auth.git
[submodule "backend-pictures"]
path = backend-pictures
url = git@makerforce.io:beep/backend-pictures.git

@ -1 +1 @@
Subproject commit 3bb821003cf308bda3bd2716bf763803b3837c0d
Subproject commit cfc9ea0672e0d1b566bc81b5c34126addd21ea7c

1
backend-pictures Submodule

@ -0,0 +1 @@
Subproject commit e64c1988cc66fd4762e311c2da11e5aa5f261fce

View File

@ -33,6 +33,7 @@ services:
- "5432:5432" # Close this for production
networks:
- pgnet
nats:
image: nats:latest
ports: # Close these for production
@ -49,6 +50,19 @@ services:
networks:
- redisnet
minio:
image: minio/minio:latest
environment:
- MINIO_ACCESS_KEY=MINIO_ID
- MINIO_SECRET_KEY=MINIO_KEY
ports:
- "9000:9000"
volumes:
- ./files:/export
command: minio server /export
networks:
- minionet
core:
build: ./backend-core
tty: true
@ -119,6 +133,24 @@ services:
networks:
- authnet
pictures:
build: ./backend-pictures
tty: true
restart: unless-stopped
depends_on:
- minio
- traefik
environment:
- LISTEN=:80
- MINIO_ENDPOINT=minio:9000
- MINIO_ID=MINIO_ID
- MINIO_KEY=MINIO_KEY
- MINIO_BUCKET_NAME=beep
- MINIO_LOCATION=us-east-1
networks:
- traefiknet
- minionet
# Pipeline
bite:
build: ./backend-bite
@ -192,3 +224,4 @@ networks:
natsnet:
redisnet:
traefiknet:
minionet:

0
files/.gitkeep Normal file
View File

View File

@ -126,6 +126,22 @@ entrypoints = ["http", "https"]
[frontends.transcription.routes.one]
rule = "PathPrefixStrip: /transcription/"
# pictures
[backends.pictures]
[backends.pictures.servers.one]
url = "http://pictures"
[frontends.pictures]
backend = "pictures"
entrypoints = ["http", "https"]
[frontends.pictures.headers.customresponseheaders]
Access-Control-Allow-Origin = "*"
Access-Control-Allow-Headers = "Content-Type, Authorization, X-User-Claim"
Access-Control-Allow-Credentials = "true"
Access-Control-Allow-Methods = "GET, HEAD, POST, PUT, PATCH, DELETE"
[frontends.pictures.routes.one]
rule = "PathPrefixStrip: /pictures/"
# login
[backends.login]
[backends.login.servers.one]