From d0642a658d103053bf5beb0ef09d21d922cbc5ee Mon Sep 17 00:00:00 2001 From: orcas Date: Fri, 21 Jun 2019 11:20:23 +0800 Subject: [PATCH 1/3] Initial add of repo backend-permissions --- .gitmodules | 3 +++ backend-permissions | 1 + 2 files changed, 4 insertions(+) create mode 160000 backend-permissions diff --git a/.gitmodules b/.gitmodules index e9a2c85..0bdfb42 100644 --- a/.gitmodules +++ b/.gitmodules @@ -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 diff --git a/backend-permissions b/backend-permissions new file mode 160000 index 0000000..8934a48 --- /dev/null +++ b/backend-permissions @@ -0,0 +1 @@ +Subproject commit 8934a485c368d25e23e3d04f69e28c1b278e048b From 18e64bd31ba83685b18b6cc5a9fdbad277359036 Mon Sep 17 00:00:00 2001 From: orcas Date: Sun, 23 Jun 2019 04:24:37 +0800 Subject: [PATCH 2/3] backend-permissions main logic --- backend-core | 2 +- backend-permissions | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/backend-core b/backend-core index 31b305a..1064edc 160000 --- a/backend-core +++ b/backend-core @@ -1 +1 @@ -Subproject commit 31b305a9c6699c8329e46be0166adbad7f15db1b +Subproject commit 1064edce60d2b78546035991455a289b79494896 diff --git a/backend-permissions b/backend-permissions index 8934a48..236ed76 160000 --- a/backend-permissions +++ b/backend-permissions @@ -1 +1 @@ -Subproject commit 8934a485c368d25e23e3d04f69e28c1b278e048b +Subproject commit 236ed765e26a90fe3068b3c7c82853c1bc2989f8 From 3a6825d15f44951860d1e6350afd5b5f9f502b11 Mon Sep 17 00:00:00 2001 From: orcas Date: Sun, 23 Jun 2019 04:57:47 +0800 Subject: [PATCH 3/3] Updated backend-permissions README --- backend-permissions | 2 +- docker-compose.yml | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/backend-permissions b/backend-permissions index 236ed76..156a0ed 160000 --- a/backend-permissions +++ b/backend-permissions @@ -1 +1 @@ -Subproject commit 236ed765e26a90fe3068b3c7c82853c1bc2989f8 +Subproject commit 156a0ed950ad1b88402bad357256114fd3a2012e diff --git a/docker-compose.yml b/docker-compose.yml index f936da7..7b5b9ae 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -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: