Fetch upstream #1
Open
Conversation
This file contains hidden or 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
* Added link to webtrees
this will be a submodule
* Testing version 2.0 nginx-proxy-companion * Start migrating to compantion v2.0 with acme.sh * Update docker-compose and .env file with new variables * Update nginx template to the latest version * Update nginx template to the latest version * Add default email variable * Add IPv6 support * update basescript to master * Update the response to strandard funcion name without check string * Update the response to strandard funcion name without check string * Comment out ipv6 * Update basescript to latest version * Fresh start script automation initial commit * Remove old scripts * Add fresh start usage * Add update nginx.tmpl with the latest version * Fix curl download file * Update usage with most common options * Set conf.d options into proxy * Comment out the default location to use the script base ./data folder * Update basescript to master * Start documenting v2 * Update README.md * Update repository name
`networks.<name>.name` is only valid for compose v3.5 and above
* I added support for Docker Rootless. This has been possible by adding the possibility to bind the docker.sock to the user's current $XDG_RUNTIME_DIR, which is found in the user's .bashrc file, that he added after installing docker rootless, by following the instructions from the official documentation (https://docs.docker.com/engine/security/rootless/) to run the Docker Daemon as a non-root user. To achieve this, I made the following changes: 1) I added the DOCKER_HOST_ROOTLESS_PATH= variable inside the .env.sample file. 2) I updated in the two required lines of the docker-compose.yml file, the following: ${DOCKER_HOST_ROOTLESS_PATH:-/var/run/docker.sock} , instead of /var/run/docker.sock:/tmp/docker.sock:ro, so that this fixes the "Error: you need to share your Docker host socket with a volume at /var/run/docker.sock. Typically you should run your container with: '-v /var/run/docker.sock:/var/run/docker.sock:ro'" error when using docker rootless. 3) I attempted to update the MD5 of both the .env.sample & docker-compose.yml file [PLEASE CHECK] 4) I updated the usage text in the usage-fresh-start.sh file, so that the user can notice this optional flag: either "-dr" or "--docker-rootless" 5) I updated the update-env-new-site-variables.sh to update the .env DOCKER_HOST_ROOTLESS_PATH to set the user's current $XDG_RUNTIME_DIR, in case the "-dr" flag has been specified. Otherwise, this is left blank and no further action is done. 6) I updated the fresh-start.sh file to take into account the "-dr" flag. Shouldn't the "-dr" flag be specified, the programme should continue normally. * Fixed an important typo in docker-compose.yml * Updated the docker-compose.yml file md5 sum Co-authored-by: Evert Ramos <evert.ramos@gmail.com>
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.
No description provided.