Branch cleanup - merge changes from serverjre8 into master. #3
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Updates Tomcat to 8.5.33 Updates the s6-overlay to drop privelleges on tomcat Adds the runscript for cron.
Update FROM base and bump Tomcat version to 8.5.34 Merge pull request Islandora-Collaboration-Group#1 from br2490/serverjre8
…ration-Group#2) * Changed base image tag from serverjre8 to 1.1.1 and updated Tomcat version to 8.5.40 from 8.5.34
|
I'm not sure if this ticket should get squashed -- maybe we should keep all the commits when merging. |
bseeger
changed the title
Update readme: - Replace old development DockerHub repo links w/ current ISLE repo!
|
We've been treating |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR merges serverjre8 into master, as serverjre8 is the main branch we want to use for isle-tomcat going forward.