From dd0224eee1a1d51126badee0e1f1b8b4b52ed000 Mon Sep 17 00:00:00 2001 From: TYueksel <44586433+TYueksel@users.noreply.github.com> Date: Fri, 17 Sep 2021 16:05:51 +0200 Subject: [PATCH 1/5] Added pattern-pedia-auth component --- docker-compose.yml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/docker-compose.yml b/docker-compose.yml index 3041993..00f2f5a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -56,6 +56,19 @@ services: - "2379:2379" networks: - default + pattern-pedia-auth: + build: https://github.com/PatternAtlas/pattern-pedia-auth.git + environment: + JDBC_DATABASE_URL: db + JDBC_DATABASE_USERNAME: postgres + JDBC_DATABASE_PASSWORD: postgres + ports: + - "8081:8081" + networks: + - default + depends_on: + - db + restart: on-failure # used by the pattern atlas to render latex latex-renderer: image: planqk/latex-renderer:latest From 50620d1c3bc04e57af8d90d223a996e0d6862852 Mon Sep 17 00:00:00 2001 From: TYueksel <44586433+TYueksel@users.noreply.github.com> Date: Mon, 20 Sep 2021 18:13:01 +0200 Subject: [PATCH 2/5] change postgres role to patternatlas --- docker-compose.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 00f2f5a..818c046 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -15,8 +15,9 @@ services: image: patternatlas/pattern-atlas-api:latest environment: JDBC_DATABASE_URL: db - JDBC_DATABASE_USERNAME: postgres - JDBC_DATABASE_PASSWORD: postgres + JDBC_DATABASE_NAME: patternatlas + JDBC_DATABASE_USERNAME: patternatlas + JDBC_DATABASE_PASSWORD: patternatlas LATEX_RENDERER_HOST_NAME: latex-renderer LATEX_RENDERER_PORT: 5030 @@ -60,8 +61,9 @@ services: build: https://github.com/PatternAtlas/pattern-pedia-auth.git environment: JDBC_DATABASE_URL: db - JDBC_DATABASE_USERNAME: postgres - JDBC_DATABASE_PASSWORD: postgres + JDBC_DATABASE_NAME: patternatlas + JDBC_DATABASE_USERNAME: patternatlas + JDBC_DATABASE_PASSWORD: patternatlas ports: - "8081:8081" networks: From 89a4f30f3e7e822a538f04a6f67e83d23a93b853 Mon Sep 17 00:00:00 2001 From: TYueksel <44586433+TYueksel@users.noreply.github.com> Date: Tue, 21 Sep 2021 16:07:27 +0200 Subject: [PATCH 3/5] changed pedia to atlas --- docker-compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 818c046..677702a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -57,8 +57,8 @@ services: - "2379:2379" networks: - default - pattern-pedia-auth: - build: https://github.com/PatternAtlas/pattern-pedia-auth.git + pattern-atlas-auth: + build: https://github.com/PatternAtlas/pattern-atlas-auth.git environment: JDBC_DATABASE_URL: db JDBC_DATABASE_NAME: patternatlas From 5b6cd776342efd40407703849017e6a2b558fda2 Mon Sep 17 00:00:00 2001 From: TYueksel <44586433+TYueksel@users.noreply.github.com> Date: Fri, 15 Oct 2021 17:00:03 +0200 Subject: [PATCH 4/5] Rename docker-compose.yml to docker-compose.auth.yml --- docker-compose.yml => docker-compose.auth.yml | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename docker-compose.yml => docker-compose.auth.yml (100%) diff --git a/docker-compose.yml b/docker-compose.auth.yml similarity index 100% rename from docker-compose.yml rename to docker-compose.auth.yml From f0eebec573f2b7e81c57426f59d417127f3f3eda Mon Sep 17 00:00:00 2001 From: TYueksel <44586433+TYueksel@users.noreply.github.com> Date: Fri, 4 Mar 2022 17:06:44 +0100 Subject: [PATCH 5/5] Change db branch --- docker-compose.auth.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/docker-compose.auth.yml b/docker-compose.auth.yml index 1e6877e..5e8c3be 100644 --- a/docker-compose.auth.yml +++ b/docker-compose.auth.yml @@ -6,7 +6,7 @@ services: POSTGRES_USER: patternatlas POSTGRES_PASSWORD: patternatlas POSTGRES_DB: patternatlas - PATTERN_ATLAS_CONTENT_REPOSITORY_BRANCH: master + PATTERN_ATLAS_CONTENT_REPOSITORY_BRANCH: add-privileges-and-roles ports: - "5060:5060" networks: @@ -20,7 +20,6 @@ services: JDBC_DATABASE_PASSWORD: patternatlas LATEX_RENDERER_HOST_NAME: latex-renderer LATEX_RENDERER_PORT: 5030 - JDBC_DATABASE_NAME: patternatlas # activate correct application properties SPRING_PROFILES_ACTIVE: docker