-
Notifications
You must be signed in to change notification settings - Fork 131
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Docker updates #3844
Docker updates #3844
Conversation
…ject/VIVO into VIVO-3786-3822-docker-updates
…-3034-psuedo-rebase
…ject/VIVO into VIVO-3786-3822-docker-updates
2f54b07
to
3b6cde3
Compare
…ject/VIVO into VIVO-3786-3822-docker-updates
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@wwelling please check my comments here, I suggest to review this PR instead of previous one (#3839), and of course we need to review Vitro PR as well (vivo-project/Vitro#370)
installer/webapp/src/main/webResources/WEB-INF/classes/log4j.properties
Outdated
Show resolved
Hide resolved
…ject/VIVO into VIVO-3786-3822-docker-updates
Dragan Ivanovic
I suppose the first two scenarios are not a problem. |
1. An institution is installing VIVO for the first time, there is only empty VIVO_HOME directory.
2. An institution is upgrading VIVO, but didn't customized VIVO_HOME, meaning didn't change any single file in rdf and config.
3. An institution is upgrading VIVO to some future VIVO which is not changing any file which should be copied to config or rdf subdirectories of VIVO_HOME, but institution customized its previous VIVO version by changing something in VIVO_HOME/config or VIVO_HOME/rdf.
4. An institution is upgrading VIVO to some future VIVO which is changing some files which should be copied to config or rdf subdirectories of VIVO_HOME (introducing new property in default.runtime.properties, adding new n3 file in rdf, etc.), and institution also customized its previous VIVO version by changing something in VIVO_HOME/config or VIVO_HOME/rdf.
|
Merge conflicts with #3940. |
This is a follow-on PR to #3839 and can be handled two ways; review this PR in place of #3839 or maintain commits of branched PR by not squash merging.
VIVO GitHub issue: #3822 and #3786
Also related to #3698 as the docker deployment supports specifying the Tomcat webapp context path.
What does this pull request do?
What's new?
Updates to the Dockerfile, docker-compose.yml, and start.sh script among other deployment related configuration files.
How should this be tested?
See README.md
Interested parties
@chenejac