-
Notifications
You must be signed in to change notification settings - Fork 6
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
decrease optional var logging level and allow to pass extra opts to pavics-compose.sh up -d
#426
Changes from 2 commits
d69088b
7567e8d
bfd402d
dead9ab
4757ed0
21ace57
5870611
5cf9838
e0a776f
6c28a86
77926f2
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -189,6 +189,10 @@ export GEOSERVER_ADMIN_PASSWORD="${__DEFAULT__GEOSERVER_ADMIN_PASSWORD}" | |
# within the autodeploy docker container as the root user. | ||
#export AUTODEPLOY_CODE_OWNERSHIP="1000:1000" | ||
|
||
# Extra options for 'pavics-compose.sh up -d'. | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This is a nitpick, but it should be There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Agreed ! Too used to always use If you forget to use |
||
# --remove-orphans useful when disabling components. Harmless when left enabled all the time. | ||
#export COMPOSE_UP_EXTRA_OPTS="--remove-orphans" | ||
|
||
# Load pre-configured job to auto-renew LetsEncrypt SSL certificate if a | ||
# LetsEncrypt SSL certificate has previously been requested. | ||
# | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -105,7 +105,10 @@ if [ x"$1" = x"info" ]; then | |
exit 0 | ||
fi | ||
|
||
COMPOSE_EXTRA_OPTS="" | ||
|
||
if [ x"$1" = x"up" ]; then | ||
COMPOSE_EXTRA_OPTS="${COMPOSE_UP_EXTRA_OPTS}" | ||
for adir in $ALL_CONF_DIRS; do | ||
COMPONENT_PRE_COMPOSE_UP="$adir/pre-docker-compose-up" | ||
if [ -x "$COMPONENT_PRE_COMPOSE_UP" ]; then | ||
|
@@ -116,7 +119,7 @@ if [ x"$1" = x"up" ]; then | |
fi | ||
|
||
# the PROXY_SECURE_PORT is a little trick to make the compose file invalid without the usage of this wrapper script | ||
PROXY_SECURE_PORT=443 HOSTNAME=${PAVICS_FQDN} docker-compose ${COMPOSE_CONF_LIST} $* | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Should there be some kind of duplicate filtering, or we simply let the command fail with any (possibility ambiguous) error message? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Good catch, yes double There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Often CLI libraries support duplicating flags to increase some level. For example, There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Right ! But activating this "strict count" for all options seems excessive ! |
||
PROXY_SECURE_PORT=443 HOSTNAME=${PAVICS_FQDN} docker-compose ${COMPOSE_CONF_LIST} ${COMPOSE_EXTRA_OPTS} $* | ||
mishaschwartz marked this conversation as resolved.
Show resolved
Hide resolved
|
||
ERR=$? | ||
|
||
# execute post-compose function if exists and no error occurred | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
"drowning" ?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
yes, thanks !