Skip to content

Commit

Permalink
Remove VIVO configuration mechanism that never takes effect
Browse files Browse the repository at this point in the history
..because it is overwritten by files in `example-config`

Resolves: vivo-community#8
  • Loading branch information
Andrew Woods committed Oct 23, 2019
1 parent d5682ab commit 6e9233c
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 520 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ Regardless of the usage, you will need to build the images, which require the fo

## VIVO Runtime Example

The example [docker-compose.yml](docker-compose.yml) is a typical installation for trying out a simple VIVO installation in docker. This file starts three containers and uses the standard SDB system with the mariadb backend. This example also shows how a local directory [example-config](example-config) is used to overwrite the default `runtime.properties` as installed by the Dockerfile. Here the root password, and the domain are modified.
The example [docker-compose.yml](docker-compose.yml) is a typical installation for trying out a simple VIVO installation in docker. This file starts three containers and uses the standard SDB system with the mariadb backend. This example also shows how a local directory [example-config](example-config) is used to overwrite the default `runtime.properties` and `applicationSetup.n3` as installed by the Dockerfile. Here the root password, and the domain are modified.

```bash
docker-compose up -d
Expand Down
3 changes: 0 additions & 3 deletions vivo/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,5 @@ RUN rm -r /usr/local/tomcat/webapps/examples
# Set properties
# Adjust logging, you can mount over this in docker-compose to further adjust
COPY ./log4j.properties /usr/local/tomcat/webapps/VIVO/WEB-INF/classes
WORKDIR /usr/local/VIVO/home/config
COPY ./dockercompose.runtime.properties runtime.properties
COPY ./example.applicationSetup.n3 applicationSetup.n3

RUN export CATALINA_OPTS="-Xms512m -Xmx512m -XX:MaxPermSize=128m"
376 changes: 0 additions & 376 deletions vivo/dockercompose.runtime.properties

This file was deleted.

Loading

0 comments on commit 6e9233c

Please sign in to comment.