fix(docker-jans-monolith): improve monolith behavior during restarts #8502
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
- restart (or stop then start): CMD in Dockerfile will now clean the jetty temp directory to prevent disk size grow - down then up: added scripts (down.sh and up.sh) that create a post installation image on a down and use it on a later up such that only first up runs the installation script - clean: added clean.sh script to remove all docker artifacts (allows for a fresh start) - Guidelines: Updated README.md and Guiding echoes in startjanssenmonolithdemo.sh - host mounted log files: The log files are now mounted on the host to improve access to them and being capable to delete them easily
|
@tawaren thanks for submitting the PR. Can you please add the DCO to your commit? |
Signed-off-by: Mohammad Abudayyeh <47318409+moabu@users.noreply.github.com>
moabu
requested changes
May 15, 2024
docker-jans-monolith/up.sh
Outdated
| fi | ||
|
|
||
| export JANSSEN_IMAGE | ||
| docker compose -f ${yaml} up |
There was a problem hiding this comment.
I think it would make more sense to run this in detached mode.
moabu
changed the title
iromli
requested changes
May 17, 2024
| echo -e "To clean up run:" | ||
| echo -e "docker compose -f /tmp/jans/docker-jans-monolith/jans-mysql-compose.yml down && rm -rf /tmp/jans" | ||
| echo -e "or docker compose -f /tmp/jans/docker-jans-monolith/jans-postgres-compose.yml down && rm -rf /tmp/jans" | ||
| echo -e "/tmp/jans/docker-jans-monolith/clean.sh mysql rm && -rf /tmp/jans" |
There was a problem hiding this comment.
Seems a typo of placing rm before &&.
iromli
requested changes
May 20, 2024
| elif [[ $JANS_PERSISTENCE == "LDAP" ]]; then | ||
| docker compose -f /tmp/jans/docker-jans-monolith/jans-ldap-compose.yml up -d | ||
| fi | ||
| /tmp/jans/docker-jans-monolith/up.sh ldap |
iromli
requested changes
May 20, 2024
| @@ -72,12 +72,11 @@ if [[ "$JANS_BUILD_COMMIT" ]]; then | |||
| fi | |||
| # -- | |||
| if [[ $JANS_PERSISTENCE == "MYSQL" ]]; then | |||
| docker compose -f /tmp/jans/docker-jans-monolith/jans-mysql-compose.yml up -d | |||
| /tmp/jans/docker-jans-monolith/up.sh mysql | |||
There was a problem hiding this comment.
Running the up.sh script will throw Permission denied because it's not executable. Probably run the script with bash /tmp/jans/... instead.
Merging changes since fork into pull request
…to ReliableRestarts
- rm after && in command hint - starting up in detached mode - stating bash explicitly for executing the scripts - added missing fi Signed-off-by: Markus Knecht markus.knecht85@gmail.com
|
I added the requested changes |
iromli
requested changes
May 21, 2024
Signed-off-by: Markus Knecht <markus.knecht85@gmail.com>
|
Changed the misstyping in the variable names |
iromli
approved these changes
May 23, 2024
moabu
approved these changes
May 23, 2024
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.
Description
Improved restarting (docker stop/start & docker compose down/up) behaviour. The monolith can now be restarted after a down without the need to run the install script again. Further, the container can be restarted without leading to an increease in the containers size.
Target issue
Ref: Diskspace usage increate after restart #8414
Implementation Details
Signed-off-by: Markus Knecht markus.knecht85@gmail.com