Merge branch 'feat/backend-permissions' of beep/backend into master
continuous-integration/drone/push Build is failing
Details
continuous-integration/drone/push Build is failing
Details
commit
66bd79925c
|
@ -34,3 +34,6 @@
|
|||
[submodule "backend-pictures"]
|
||||
path = backend-pictures
|
||||
url = git@makerforce.io:beep/backend-pictures.git
|
||||
[submodule "backend-permissions"]
|
||||
path = backend-permissions
|
||||
url = git@makerforce.io:beep/backend-permissions.git
|
||||
|
|
|
@ -1 +1 @@
|
|||
Subproject commit 31b305a9c6699c8329e46be0166adbad7f15db1b
|
||||
Subproject commit 1064edce60d2b78546035991455a289b79494896
|
|
@ -0,0 +1 @@
|
|||
Subproject commit 156a0ed950ad1b88402bad357256114fd3a2012e
|
|
@ -151,6 +151,23 @@ services:
|
|||
- traefiknet
|
||||
- minionet
|
||||
|
||||
# Permissions
|
||||
permissions:
|
||||
build: ./backend-permissions
|
||||
tty: true
|
||||
restart: unless-stopped
|
||||
depends_on:
|
||||
- redis
|
||||
- pg
|
||||
environment:
|
||||
- LISTEN=:80
|
||||
- POSTGRES=postgresql://root@pg:5432/core?sslmode=disable
|
||||
- REDIS=redis:6379
|
||||
networks:
|
||||
- pgnet
|
||||
- redisnet
|
||||
- permissionsnet
|
||||
|
||||
# Pipeline
|
||||
bite:
|
||||
build: ./backend-bite
|
||||
|
@ -225,3 +242,4 @@ networks:
|
|||
redisnet:
|
||||
traefiknet:
|
||||
minionet:
|
||||
permissionsnet:
|
||||
|
|
Loading…
Reference in New Issue