Skip to content

Latest commit

 

History

History
191 lines (152 loc) · 8.4 KB

README.md

File metadata and controls

191 lines (152 loc) · 8.4 KB

Docker Compose Resources

root directory Resources

  • docker-compose.yml
    • Docker compose file to orchestrate DSpace 7 REST components
  • docker-compose-cli
    • Docker compose file to run DSpace CLI tasks within a running DSpace instance in Docker

dspace/src/main/docker-compose resources

  • cli.assetstore.yml
    • Docker compose file that will download and install a default assetstore.
  • cli.ingest.yml
    • Docker compose file that will run an AIP ingest into DSpace 7.
  • db.entities.yml
    • Docker compose file that pre-populate a database instance using a SQL dump. The default dataset is the configurable entities test dataset.
  • local.cfg
    • Sets the environment used across containers run with docker-compose
  • docker-compose-angular.yml
    • Docker compose file that will start a published DSpace angular container that interacts with the branch.
  • docker-compose-shibboleth.yml
    • Docker compose file that will start a test/demo Shibboleth SP container (in Apache) that proxies requests to the DSpace container
    • ONLY useful for testing/development. NOT production ready.
  • environment.dev.ts
    • Default angular environment when testing DSpace-angular from this repo

To refresh / pull DSpace images from Dockerhub

docker-compose -f docker-compose.yml -f docker-compose-cli.yml pull

To build DSpace images using code in your branch

docker-compose -f docker-compose.yml -f docker-compose-cli.yml build

Run DSpace 7 REST from your current branch

docker-compose -p d7 up -d

Run DSpace 7 REST and Angular from your branch

docker-compose -p d7 -f docker-compose.yml -f dspace/src/main/docker-compose/docker-compose-angular.yml up -d

Run DSpace 7 REST and Shibboleth SP (in Apache) from your branch

Only useful for testing Shibboleth in a development environment

This Shibboleth container uses https://samltest.id/ as an IdP (see ../docker/dspace-shibboleth/). Therefore, for Shibboleth login to work properly, you MUST make your DSpace site available to the external web.

One option is to use a development proxy service like https://ngrok.com/, which creates a temporary public proxy for your localhost. The remainder of these instructions assume you are using ngrok (though other proxies may be used).

  1. If you use ngrok, start it first (in order to obtain a random URL that looks like https://a6eb2e55ad17.ngrok.io):

    ./ngrok http 443

  2. Then, update local.cfg in this directory to use that ngrok URL & configure Shibboleth:

    # NOTE: dspace.server.url MUST be available externally to use with https://samltest.id/.
# In this example we are assuming you are using ngrok.
dspace.server.url=https://[subdomain].ngrok.io/server

# Enable both Password auth & Shibboleth
plugin.sequence.org.dspace.authenticate.AuthenticationMethod = org.dspace.authenticate.PasswordAuthentication
plugin.sequence.org.dspace.authenticate.AuthenticationMethod = org.dspace.authenticate.ShibAuthentication

# Settings for https://samltest.id/
authentication-shibboleth.netid-header = uid
authentication-shibboleth.email-header = mail
authentication-shibboleth.firstname-header = givenName
authentication-shibboleth.lastname-header = sn
authentication-shibboleth.role-header = role

  3. Build the Shibboleth container (if you haven't built or pulled it before):

    cd [dspace-src]
docker-compose -p d7 -f docker-compose.yml -f dspace/src/main/docker-compose/docker-compose-shibboleth.yml build

  4. Start all containers, passing your public hostname as the DSPACE_HOSTNAME environment variable:

    DSPACE_HOSTNAME=[subdomain].ngrok.io docker-compose -p d7 -f docker-compose.yml -f dspace/src/main/docker-compose/docker-compose-shibboleth.yml up -d

    NOTE: For Windows you MUST either set the environment variable separately, or use the 'env' command provided with Git/Cygwin (you may already have this command if you are running Git for Windows). See https://superuser.com/a/1079563

    env DSPACE_HOSTNAME=[subdomain].ngrok.io docker-compose -p d7 -f docker-compose.yml -f dspace/src/main/docker-compose/docker-compose-shibboleth.yml up -d

  5. Finally, for https://samltest.id/, you need to upload your Shibboleth Metadata for the site to "trust" you. Using the form at https://samltest.id/upload.php, enter in https://[subdomain].ngrok.io/Shibboleth.sso/Metadata and click "Fetch!"

    • Note: If samltest.id still says you are untrusted, restart your Shibboleth daemon! (This may be necessary to download the IdP Metadata from samltest.id) 
      docker exec -it dspace-shibboleth /bin/bash
service shibd stop
service shibd start

  6. At this point, if all went well, your site should work! Try it at https://[subdomain].ngrok.io/server/

  7. If you want to include Angular UI as well, then you'll need a few extra steps:

    • Update environment.dev.ts in this directory as follows: 
      rest: {
  ssl: true,
  host: '[subdomain].ngrok.io',
  port: 443,
  // NOTE: Space is capitalized because 'namespace' is a reserved string in TypeScript
  nameSpace: '/server'
}
    • Spin up the dspace-angular container alongside the others, e.g. 
      DSPACE_HOSTNAME=[subdomain].ngrok.io docker-compose -p d7 -f docker-compose.yml -f dspace/src/main/docker-compose/docker-compose-angular.yml -f dspace/src/main/docker-compose/docker-compose-shibboleth.yml up -d

Run DSpace 7 REST and Angular from local branches

The system will be started in 2 steps. Each step shares the same docker network.

From DSpace/DSpace

docker-compose -p d7 up -d

From DSpace/DSpace-angular (build as needed)

docker-compose -p d7 -f docker/docker-compose.yml up -d

Ingest Option 1: Ingesting test content from AIP files into a running DSpace 7 instance

Prerequisites

  • Start DSpace 7 using one of the options listed above
  • Build the DSpace CLI image if needed. See the instructions above.

Create an admin account. By default, the dspace-cli container runs the dspace command.

docker-compose -p d7 -f docker-compose-cli.yml run --rm dspace-cli create-administrator -e [email protected] -f admin -l user -p admin -c en

Download a Zip file of AIP content and ingest test data

docker-compose -p d7 -f docker-compose-cli.yml -f dspace/src/main/docker-compose/cli.ingest.yml run --rm dspace-cli

Ingest Option 2: Ingest Entities Test Data

Remove your d7 volumes if you already ingested content into your docker volumes

Start DSpace REST with a postgres database dump downloaded from the internet.

docker-compose -p d7 -f docker-compose.yml -f dspace/src/main/docker-compose/db.entities.yml up -d

Download an assetstore from a tar file on the internet.

docker-compose -p d7 -f docker-compose-cli.yml -f dspace/src/main/docker-compose/cli.assetstore.yml run dspace-cli

Modify DSpace Configuration in Docker

While your Docker containers are running, you may directly modify the local.cfg in this directory which will change the DSpace configuration for the running Docker container. (Keep in mind, this works because our docker-compose.yml mounts this [src]/dspace/src/main/docker-compose/local.cfg from the host into the running Docker instance.)

Many DSpace configuration settings will reload automatically (after a few seconds). However, configurations which are cached by DSpace (or by Spring Boot) may require you to quickly reboot the Docker containers by running docker-compose -p d7 down followed by docker-compose -p d7 up -d.

Running DSpace CLI scripts in Docker

While the Docker containers are running, you can use the DSpace CLI image to run any DSpace commandline script (i.e. any command that normally can be run by [dspace]/bin/dspace). The general format is:

docker-compose -p d7 -f docker-compose-cli.yml run --rm dspace-cli [command] [parameters]

So, for example, to reindex all content in Discovery, normally you'd run ./dspace index-discovery -b from commandline. Using our DSpace CLI image, that command becomes:

docker-compose -p d7 -f docker-compose-cli.yml run --rm dspace-cli index-discovery -b

Similarly, you can see the value of any DSpace configuration (in local.cfg or dspace.cfg) by running:

# Output the value of `dspace.ui.url` from running Docker instance
docker-compose -p d7 -f docker-compose-cli.yml run --rm dspace-cli dsprop -p dspace.ui.url