Merge pull request #125 from samply/review-project-manager-connection…

…-torben

Adjustments to project-manager connection deployment

.gitignore

@@ -29,3 +29,5 @@ TODO
 docker-compose.override.yml
 *.priv.pem
 traefik.yaml
+
+project-manager.env

docker-compose.dev.yml

@@ -47,6 +47,28 @@ services:
     profiles:
       - "beam"
 
+  project-manager:
+    image: samply/project-manager:develop
+    ports:
+      - 8097:8097
+    env_file:
+      - env/project-manager.env
+    volumes:
+      - "./templates:/templates"
+      - "./documents:/documents"
+      - "./public-documents:/public-documents"
+    profiles:
+      - "project-manager"
+
+  project-manager-db:
+    image: postgres:alpine
+    environment:
+      POSTGRES_DB: dev
+      POSTGRES_USER: dev
+      POSTGRES_PASSWORD: dev
+    profiles:
+      - "project-manager"
+
 secrets:
   proxy.pem:
     file: /etc/lens/pki/${LOCAL_BEAM_ID}.priv.pem

docker-compose.yml

@@ -8,7 +8,6 @@ services:
       - --entrypoints.websecure.address=:443
       - --providers.docker=true
       - --providers.docker.exposedbydefault=false
-      # - --providers.file.directory=/conf/
       - --accesslog=true
     ports:
       - "80:80"
@@ -65,7 +64,6 @@ services:
     ports:
       - "8055:8055"
     environment:
-      RUST_LOG: "debug,hyper=info"
       HTTP_PROXY: ${http_proxy}
       HTTPS_PROXY: ${https_proxy}
       NO_PROXY: beam-proxy, prism
@@ -76,7 +74,7 @@ services:
       CATALOGUE_URL: "${CATALOGUE_URL}"
       BIND_ADDR: 0.0.0.0:8055
       PRISM_URL: http://prism:8066
-      # RUST_LOG: "info"
+      RUST_LOG: "info"
       LOG_FILE: /requests.log
     volumes:
       - ./requests.log:/requests.log
@@ -132,29 +130,6 @@ services:
       - "traefik.http.middlewares.prism-stripprefix.stripprefix.prefixes=/prism"
       - "traefik.http.routers.prism.middlewares=corsheaders,traefik-forward-auth,prism-stripprefix"
 
-  project-manager:
-    image: samply/project-manager:develop
-    ports:
-      - 8097:8097
-    # environment:
-    #   OIDC_CLIENT_ID: ${PROJECT_MANAGER_OAUTH_CLIENT_ID}
-    #   OIDC_CLIENT_SECRET: ${PROJECT_MANAGER_OAUTH_CLIENT_SECRET}
-    #   OIDC_REALM: ${PROJECT_MANAGER_OAUTH_CLIENT_REALM}
-    #   OIDC_URL: ${PROJECT_MANAGER_OAUTH_ISSUER_URL}
-    env_file:
-      - env/project-manager.env
-    volumes:
-      - "./templates:/templates"
-      - "./documents:/documents"
-      - "./public-documents:/public-documents"
-
-  project-manager-db:
-    image: postgres:alpine
-    environment:
-      POSTGRES_DB: dev
-      POSTGRES_USER: dev
-      POSTGRES_PASSWORD: dev
-
 secrets:
   proxy.pem:
     # TODO: Key in BBMRI was directly stored in lens directory!

example.env

@@ -19,12 +19,6 @@ OAUTH_CLIENT_ID="your-oauth-client-id"
 OAUTH_CLIENT_SECRET="your-oauth-client-id"
 AUTHENTICATION_SECRET="insert-a-random-passphrase-here"
 
-PROJECT_MANAGER_OAUTH_URL="your-url-for-project-manager-client"
-PROJECT_MANAGER_OAUTH_REALM="your-realm-for-project-manager-client"
-PROJECT_MANAGER_OAUTH_CLIENT_ID="your-id-for-project-manager-client"
-PROJECT_MANAGER_OAUTH_CLIENT_SECRET="your-secret-for-project-manager-client"
-
-PROJECT_PATH="/Users/e260admin/dkfz/projects/lens-svelte-web_components/lens-web-components"
 ALLOWED_GROUPS="SPACE SEPARATED LIST OF GROUPS"
 
 # URL to catalogue.json; this is given to Spot to hold the catalogue (with extended metadata) for Lens