Skip to content

Commit

Permalink
fix ipranges in docker composes (#536)
Browse files Browse the repository at this point in the history
removed redundant network spec, added config from upstream
  • Loading branch information
MajoBerger committed Mar 5, 2024
1 parent 3550110 commit fdf97fb
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 6 deletions.
6 changes: 0 additions & 6 deletions docker/cli.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,3 @@ volumes:

networks:
dspacenet:
ipam:
config:
# Define a custom subnet for our DSpace network, so that we can easily trust requests from host to container.
# If you customize this value, be sure to customize the 'proxies.trusted.ipranges' env variable below.
- subnet: 172.23.0.0/16

3 changes: 3 additions & 0 deletions docker/docker-compose-rest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,9 @@ services:
db__P__url: 'jdbc:postgresql://dspacedb:543${INSTANCE}/dspace'
# solr.server: Ensure we are using the 'dspacesolr' image for Solr
solr__P__server: http://dspacesolr:898${INSTANCE}/solr
# proxies.trusted.ipranges: This setting is required for a REST API running in Docker to trust requests
# from the host machine. This IP range MUST correspond to the 'dspacenet' subnet defined above.
proxies__P__trusted__P__ipranges: '172.2${INSTANCE}.0'
#S3 config
assetstore__P__index__P__primary: ${S3_STORAGE:-0}
assetstore__P__s3__P__enabled: ${S3_ENABLED:-false}
Expand Down

0 comments on commit fdf97fb

Please sign in to comment.