diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-02-23 15:38:06 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-02-23 15:38:06 +0000 |
| commit | 314b5026d93f4848d59b598c2762b4bf0bc9057e (patch) | |
| tree | 12a7ebcc91b209808b9dd19b9fdac193367120b6 /docker | |
| parent | 6b4e726bae07318417c69b490d4e0ad15230c7c1 (diff) | |
| parent | 2597bf8cfd27dc82133cc4bf978c8268f00953b6 (diff) | |
| download | kolla-314b5026d93f4848d59b598c2762b4bf0bc9057e.tar.gz kolla-314b5026d93f4848d59b598c2762b4bf0bc9057e.zip | |
Merge "Skip extend_start.sh if KOLLA_SKIP_EXTEND_START is defined"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/base/start.sh | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/docker/base/start.sh b/docker/base/start.sh index a42c01391..78923c75a 100644 --- a/docker/base/start.sh +++ b/docker/base/start.sh @@ -25,8 +25,10 @@ sudo -E kolla_set_configs CMD=$(cat /run_command) ARGS="" -# Run additional commands if present -source kolla_extend_start +if [[ ! "${!KOLLA_SKIP_EXTEND_START[@]}" ]]; then + # Run additional commands if present + source kolla_extend_start +fi echo "Running command: '${CMD}${ARGS:+ $ARGS}'" exec ${CMD} ${ARGS} |