Xxkel sd/multiple spaces #378
Closed
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
|
|
N-lson
suggested changes
Sep 20, 2022
There was a problem hiding this comment.
Hey @xxkel-sd, sorry about the delay. Thanks for submitting a PR! This would be a useful addition to the docker image. I've tested using the Linux image and found that ${CONFIG_DIR} wasn't set to anything which I've left a comment on.
Could you please rebase/merge the latest changes from main into this branch along with checking that env var is the value we're passing in? Once that's done feel free to request a review from myself again and we'll get this merged 🙇
| echo "Configuring Octopus Deploy Tentacle" | ||
| echo "===============================================" | ||
| configureTentacle | ||
| for filename in $(realpath ${CONFIG_DIR}/*.conf); do |
There was a problem hiding this comment.
Should ${CONFIG_DIR} be ${ConfigDir} like line 215?
| @@ -59,6 +59,15 @@ docker run --publish 10931:10933 --tty --interactive --env "ListeningPort=10931" | |||
| - **ListeningPort**: The port that the Octopus Server will connect back to the Tentacle with. Defaults to 10933. Implies a listening Tentacle. | |||
| - **PublicHostNameConfiguration**: How the url that the Octopus server will use to communicate with the Tentacle is determined. Can be `PublicIp`, `FQDN`, `ComputerName` or `Custom`. Defaults to `PublicIp`. | |||
| - **CustomPublicHostName**: If `PublicHostNameConfiguration` is set to `Custom`, the host name that the Octopus Server should use to communicate with the Tentacle. | |||
| - **ConfigDir**: If specified all files matching *.conf in this directory will be used for configuring the tentacle. Each .conf file allows overriding the environment variables specified for the container. If there's no override the environment variable for the container will be used. This will allow for multiple configurations of the same tentacle and could be used for registering the same tentacle in multiple spaces. | |||
There was a problem hiding this comment.
Suggested change
| - **ConfigDir**: If specified all files matching *.conf in this directory will be used for configuring the tentacle. Each .conf file allows overriding the environment variables specified for the container. If there's no override the environment variable for the container will be used. This will allow for multiple configurations of the same tentacle and could be used for registering the same tentacle in multiple spaces. | |
| - **ConfigDir**: Allows registering multiple configurations of the same Tentacle. If specified, all files matching `*.conf` in this directory will be used to configure and register a Tentacle. Each `.conf` file allows overriding the environment variables specified for the container. A new configuration will be created for each `.conf` file. Any environment variables with no override will default to the container-level environment variable value. This can be used for registering the same Tentacle in multiple spaces. |
| @@ -59,6 +59,15 @@ docker run --publish 10931:10933 --tty --interactive --env "ListeningPort=10931" | |||
| - **ListeningPort**: The port that the Octopus Server will connect back to the Tentacle with. Defaults to 10933. Implies a listening Tentacle. | |||
| - **PublicHostNameConfiguration**: How the url that the Octopus server will use to communicate with the Tentacle is determined. Can be `PublicIp`, `FQDN`, `ComputerName` or `Custom`. Defaults to `PublicIp`. | |||
| - **CustomPublicHostName**: If `PublicHostNameConfiguration` is set to `Custom`, the host name that the Octopus Server should use to communicate with the Tentacle. | |||
| - **ConfigDir**: If specified all files matching *.conf in this directory will be used for configuring the tentacle. Each .conf file allows overriding the environment variables specified for the container. If there's no override the environment variable for the container will be used. This will allow for multiple configurations of the same tentacle and could be used for registering the same tentacle in multiple spaces. | |||
|
|
|||
| #### Example on a .conf file: | |||
There was a problem hiding this comment.
Suggested change
| #### Example on a .conf file: | |
| #### Example .conf file: |
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.
Are you a customer of Octopus Deploy? Please contact our support team so we can triage your PR, so that we can make sure it's handled appropriately.
Background
Add ability to apply multiple configurations for a tentacle - for instance have the tentacle registered in multiple spaces.
Results
Fixes #377
How to review this PR
Test that change is backwards compatible by not using the new ConfigDir environment variable
Test that using the new ConfigDir environment variable will apply the configurations in the ConfigDir - once for each .conf file. This should be tested for Linux as well as Windows.
Quality ✔️
Pre-requisites