diff --git a/Makefile b/Makefile index df66413f0..e9c725487 100644 --- a/Makefile +++ b/Makefile @@ -319,7 +319,7 @@ download-default-certs: .SILENT: demo demo: $(MAKE) download-default-certs ENVIROMENT=demo - $(MAKE) docker-compose.yml ENVIROMENT=demo + $(MAKE) -B docker-compose.yml ENVIROMENT=demo $(MAKE) pull ENVIROMENT=demo mkdir -p $(CURDIR)/codebase docker-compose up -d @@ -339,7 +339,7 @@ demo: .SILENT: local local: $(MAKE) download-default-certs ENVIROMENT=local - $(MAKE) docker-compose.yml ENVIRONMENT=local + $(MAKE) -B docker-compose.yml ENVIRONMENT=local $(MAKE) pull ENVIRONMENT=local mkdir -p $(CURDIR)/codebase if [ -z "$$(ls -A $(CURDIR)/codebase)" ]; then \ diff --git a/docker-compose.fcrepo.yml b/docker-compose.fcrepo.yml index 31a60751c..417f34a9d 100644 --- a/docker-compose.fcrepo.yml +++ b/docker-compose.fcrepo.yml @@ -11,7 +11,8 @@ services: fcrepo: image: ${REPOSITORY:-islandora}/fcrepo:${TAG:-latest} environment: - FCREPO_ALLOW_EXTERNAL_DRUPAL: http://${DOMAIN}/ + FCREPO_ALLOW_EXTERNAL_DRUPALHTTP: http://${DOMAIN}/ + FCREPO_ALLOW_EXTERNAL_DRUPALHTTPS: https://${DOMAIN}/ FCREPO_TOMCAT_ADMIN_ROLES: manager-gui,fedoraAdmin FCREPO_TOMCAT_ADMIN_USER: admin FCREPO_DISABLE_SYN: ${DISABLE_SYN} diff --git a/docker-compose.fcrepo6.yml b/docker-compose.fcrepo6.yml index 30e95d2d7..a92af4de0 100644 --- a/docker-compose.fcrepo6.yml +++ b/docker-compose.fcrepo6.yml @@ -11,7 +11,8 @@ services: fcrepo: image: ${REPOSITORY:-islandora}/fcrepo6:${TAG:-latest} environment: - FCREPO_ALLOW_EXTERNAL_DRUPAL: http://${DOMAIN}/ + FCREPO_ALLOW_EXTERNAL_DRUPALHTTP: http://${DOMAIN}/ + FCREPO_ALLOW_EXTERNAL_DRUPALHTTPS: https://${DOMAIN}/ FCREPO_TOMCAT_ADMIN_ROLES: manager-gui,fedoraAdmin FCREPO_TOMCAT_ADMIN_USER: admin FCREPO_DISABLE_SYN: ${DISABLE_SYN}