Merge main into dev #196
Draft
Merge main into dev #196
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
* Add custom SSL helpers
This reverts commit 7098b15.
* Platform v1.48
* Echo when auto updates not enabled.
It was confusing to echo the header for enabling automatic updates and
then do/print nothing.
* Log that we are running git pull.
This is helpful for anyone who has an ssh-agent that requires PIN /
touch confirmation, to know that the script is blocked on git pull.
* Remove deprecated docker-compose version field.
This silences this warning:
docker-compose.yml: the attribute `version` is obsolete, it will be ignored, please remove it to avoid potential confusion
* Fix unescaped \ in ascii art.
* Rename run() to logrun().
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.
I had to manually fix conflicts in
docker-compose.yml. Not 100% sure I took the right values, so it would be good to double check the diff.