Skip to content

Commit

Permalink
ls-aai network is external
Browse files Browse the repository at this point in the history
  • Loading branch information
jbygdell committed Feb 16, 2024
1 parent 2147d7c commit 624d08e
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 10 deletions.
5 changes: 3 additions & 2 deletions .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
14 changes: 6 additions & 8 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -136,11 +135,12 @@ 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
Expand Down Expand Up @@ -273,11 +273,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
ports:
- "8000:8000"
restart: always
Expand All @@ -294,6 +295,3 @@ volumes:
networks:
public:
secure:
# required for allowing auth to connect to ls-aai-mock
my-app-network:
name: my-app-network

0 comments on commit 624d08e

Please sign in to comment.