From 1d4479810ee7410238598e56f7f126b58cacfe36 Mon Sep 17 00:00:00 2001
From: Joakim Bygdell <joakim.bygdell@nbis.se>
Date: Thu, 15 Feb 2024 17:30:34 +0100
Subject: [PATCH] ls-aai network is external

---
 .env.example       |  5 +++--
 docker-compose.yml | 18 +++++++-----------
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/.env.example b/.env.example
index 8157fc0..3850c0e 100644
--- a/.env.example
+++ b/.env.example
@@ -9,12 +9,13 @@ credentials_PGPASSWORD=rootpass
 
 # auth
 auth_ELIXIR_ID=XC56EL11xx
-auth_ELIXIR_PROVIDER=http://aai-mock:8080/oidc/
+auth_ELIXIR_PROVIDER=http://dockerhost:8080/oidc/
 auth_ELIXIR_SECRET=wHPVQaYXmdDHg
 auth_ELIXIR_JWKPATH=jwk
 auth_ELIXIR_REDIRECTURL=http://localhost:8085/elixir/login
 auth_LOG_LEVEL=info
-auth_S3INBOX=localhost:8000
+auth_RESIGNJWT=false
+auth_S3INBOX=httpp://dockerhost:8000
 
 # rabbitmq
 rabbitmq_MQ_PASSWORD=test
diff --git a/docker-compose.yml b/docker-compose.yml
index e680c8a..9d3d675 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -38,13 +38,12 @@ services:
       - PUBLICFILE=/shared/c4gh.pub.pem
       - RESIGNJWT=false
       - S3INBOX=${auth_S3INBOX}
+    extra_hosts:
+      - "dockerhost:host-gateway"
     volumes:
       - shared:/shared
     ports:
       - 8085:8080
-    networks:
-      - public
-      - my-app-network
     restart: always
 
   rabbitmq:
@@ -136,11 +135,11 @@ services:
     environment:
       - DB_PASSWORD=${download_DB_PASSWORD}
       - DB_USER=${download_DB_USER}
+    extra_hosts:
+      - "dockerhost:host-gateway"
     image: ghcr.io/neicnordic/sensitive-data-archive:v0.2.88-download
     networks:
-      - public
       - secure
-      - my-app-network
     ports:
       - 8443:8443
     restart: always
@@ -273,11 +272,12 @@ services:
       - BROKER_USER=${s3inbox_BROKER_USER}
       - DB_PASSWORD=${s3inbox_DB_PASSWORD}
       - DB_USER=${s3inbox_DB_USER}
+    extra_hosts:
+      - "dockerhost:host-gateway"
     image: ghcr.io/neicnordic/sensitive-data-archive:v0.2.88
     networks:
-      - public
       - secure
-      - my-app-network
+      # - my-app-network
     ports:
       - "8000:8000"
     restart: always
@@ -292,8 +292,4 @@ volumes:
   s3data:
 
 networks:
-  public:
   secure:
-  # required for allowing auth to connect to ls-aai-mock
-  my-app-network:
-    name: my-app-network