diff --git a/.env b/.env index ba7651c01..934bf6b74 100644 --- a/.env +++ b/.env @@ -1,10 +1,10 @@ LOCAL_SOLR_PORT=8983 LOCAL_SOLR_DATA=./vivo-solr -RESET_CORE=true +RESET_CORE=false LOCAL_VIVO_PORT=8080 LOCAL_VIVO_HOME=./vivo-home -RESET_HOME=true +RESET_HOME=false VIVO_HOME=/usr/local/vivo/home diff --git a/Dockerfile b/Dockerfile index bb7159b82..b27fb6a40 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,7 +10,7 @@ ENV ROOT_USER_ADDRESS=vivo_root@mydomain.edu ENV DEFAULT_NAMESPACE=http://vivo.mydomain.edu/individual/ ENV SOLR_URL=http://localhost:8983/solr/vivocore -ENV SELF_ID_MATCHING_PROPERTY=http://vivo.mydomain.edu/ns +ENV SELF_ID_MATCHING_PROPERTY=http://vivo.mydomain.edu/ns#networkId ENV LOAD_SAMPLE_DATA=false ENV SAMPLE_DATA_REPO_URL=https://github.com/vivo-project/sample-data.git diff --git a/README.md b/README.md index 28d018128..eb3519d2c 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ VIVO docker container is available at [vivoweb/vivo](https://hub.docker.com/r/vi #### Build Args -Build args are used at time of building the Docker image. +Build args used at time of building the Docker image. | Variable | Description | Default | | ----------------------------- | -----------------------------| ------------------------------------ | @@ -42,7 +42,7 @@ Build args are used at time of building the Docker image. | Variable | Description | Default | | ----------------------------- | ---------------------------------------------------------------- | ----------------------------------------------- | | TOMCAT_CONTEXT_PATH | Tomcat webapp context path | ROOT | -| VIVO_HOME | VIVO home directory in container | /usr/local/vivo/home | +| VIVO_HOME | VIVO home directory in container | /usr/local/vivo/home | | TDB_FILE_MODE | TDB file mode | direct | | ROOT_USER_ADDRESS | Root user email address | vivo_root@mydomain.edu | | DEFAULT_NAMESPACE | Default namespace | http://vivo.mydomain.edu/individual/ | diff --git a/docker-compose.yml b/docker-compose.yml index 0b80b98a6..f5d83d3bc 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -36,10 +36,10 @@ services: - SOLR_URL=http://solr:8983/solr/vivocore - LANGUAGE_FILTER_ENABLED=true - SELECTABLE_LOCALES=en_US,de_DE,sr_Latn_RS,ru_RU,fr_CA,en_CA,es,pt_BR - - LOAD_SAMPLE_DATA=true + - LOAD_SAMPLE_DATA=false - SAMPLE_DATA_REPO_URL=https://github.com/chenejac/sample-data.git - SAMPLE_DATA_BRANCH=reorganization - - SAMPLE_DATA_DIRECTORY=demovivo + - SAMPLE_DATA_DIRECTORY=openvivo - CATALINA_OPTS=-Xms2048M -Xmx8192M ports: - ${LOCAL_VIVO_PORT}:8080