Clean up auto-setup.sh #2516
Merged
Clean up auto-setup.sh #2516
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
dnr
reviewed
Feb 17, 2022
docker/auto-setup.sh
Outdated
|
|
||
| # === Main database functions === | ||
|
|
||
| validate_db_env() { | ||
| if [ "${DB}" == "mysql" ]; then | ||
| if [ -z "${MYSQL_SEEDS}" ]; then | ||
| if [[ ${DB} == mysql ]]; then |
There was a problem hiding this comment.
optional: I'd replace an if/elif chain with case
There was a problem hiding this comment.
Wow, there are case in bash.
| @@ -2,7 +2,8 @@ | |||
|
|
|||
| set -eu -o pipefail | |||
|
|
|||
| export BIND_ON_IP="${BIND_ON_IP:-$(hostname -i)}" | |||
| : "${BIND_ON_IP:=$(hostname -i)}" | |||
| export BIND_ON_IP | |||
|
|
|||
| if [[ "${BIND_ON_IP}" =~ ":" ]]; then | |||
| # ipv6 | |||
There was a problem hiding this comment.
several lines below (github won't let me comment on the right line):
replace for arg in "$@"; with for arg;
I might also convert that into a single for loop containing a case
There was a problem hiding this comment.
The sequence is important there. I want them to be processed in this sequence no matter on how they are passed in args.
1823775 to
b77d627
Compare
|
|
dnr
approved these changes
Feb 18, 2022
docker/entrypoint.sh
Outdated
| @@ -16,12 +16,12 @@ fi | |||
| dockerize -template /etc/temporal/config/config_template.yaml:/etc/temporal/config/docker.yaml | |||
|
|
|||
| # Automatically setup Temporal Server (databases, Elasticsearch, default namespace) if "autosetup" is passed as an argument. | |||
| for arg in "$@" ; do [[ ${arg} == "autosetup" ]] && /etc/temporal/auto-setup.sh && break ; done | |||
| for arg in "$@" ; do [[ ${arg} == autosetup ]] && /etc/temporal/auto-setup.sh && break ; done | |||
There was a problem hiding this comment.
could do for arg; do ... here and next one too
There was a problem hiding this comment.
🤦 how I didn't notice it at the first place?
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.
What changed?
Clean up
auto-setup.shand other scripts.Why?
For better readability as was suggested by @dnr in #2495.
How did you test it?
Build and run auto-setup docker image locally.
Potential risks
No risks.
Is hotfix candidate?
No.