Skip to content

Commit 7e17d40

Browse files
committed
Try another fix
1 parent bcfba06 commit 7e17d40

1 file changed

Lines changed: 5 additions & 19 deletions

File tree

docker/cli.yml

Lines changed: 5 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -13,34 +13,21 @@
1313
#
1414
# Therefore, it should be kept in sync with that file
1515
networks:
16-
# Default to using network named 'dspacenet' from docker-compose-rest.yml.
17-
# Its full name will be prepended with the project name (e.g. "-p d7" means it will be named "d7_dspacenet")
18-
# If COMPOSITE_PROJECT_NAME is missing, default value will be "docker" (name of folder this file is in)
19-
default:
20-
name: ${COMPOSE_PROJECT_NAME:-docker}_dspacenet
16+
dspacenet:
2117
external: false
18+
2219
services:
2320
dspace-cli:
2421
image: "${DOCKER_OWNER:-dataquest}/dspace-cli:${DSPACE_VER:-dspace-7_x}"
2522
container_name: dspace-cli
2623
environment:
2724
TZ: ${TIMEZONE:-Europe/Bratislava}
28-
# Below syntax may look odd, but it is how to override dspace.cfg settings via env variables.
29-
# See https://github.com/DSpace/DSpace/blob/main/dspace/config/config-definition.xml
30-
# __P__ => "." (e.g. dspace__P__dir => dspace.dir)
31-
# __D__ => "-" (e.g. google__D__metadata => google-metadata)
32-
# dspace.dir
3325
dspace__P__dir: /dspace
3426
dspace__P__server__P__url: ${REST_URL:-http://127.0.0.1:8080/server}
3527
dspace__P__ui__P__url: ${UI_URL:-http://127.0.0.1:4000}
3628
dspace__P__name: 'DSpace Started with Docker Compose'
37-
# db.url: Ensure we are using the 'dspacedb' image for our database
3829
db__P__url: 'jdbc:postgresql://dspacedb:${PG_PORT}/dspace'
39-
# solr.server: Ensure we are using the 'dspacesolr' image for Solr
40-
4130
solr__P__server: http://dspacesolr:${SOLR_PORT}/solr
42-
43-
# S3
4431
assetstore__P__index__P__primary: ${S3_STORAGE:-0}
4532
assetstore__P__s3__P__enabled: ${S3_ENABLED:-false}
4633
assetstore__P__s3__P__useRelativePath: ${S3_RELATIVE_PATH:-false}
@@ -49,13 +36,12 @@ services:
4936
assetstore__P__s3__P__awsAccessKey: ${S3_ACCESS:-}
5037
assetstore__P__s3__P__awsSecretKey: ${S3_SECRET:-}
5138
assetstore__P__s3__P__awsRegionName: ${S3_REGION_NAME:-}
52-
5339
assetstore__P__s3__P__pathStyleAccessEnabled: ${S3_PATH_STYLE_ACCESS:-false}
5440
assetstore__P__s3__P__endpoint: ${S3_ENDPOINT:-}
5541
volumes:
56-
- "assetstore:/dspace/assetstore"
57-
- dspace_cli_logs:/dspace/log
58-
- ./local.cfg:/dspace/config/local.cfg
42+
- "assetstore:/dspace/assetstore"
43+
- dspace_cli_logs:/dspace/log
44+
- ./local.cfg:/dspace/config/local.cfg
5945
entrypoint: /dspace/bin/dspace
6046
command: help
6147
tty: true

0 commit comments

Comments
 (0)