diff options
| author | Zuul <zuul@review.opendev.org> | 2020-10-12 15:18:26 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-10-12 15:18:26 +0000 |
| commit | c41c6568b447e5170a953de50084dd99ddc22436 (patch) | |
| tree | 930f7f0670f731fa92655439d90e4d54e0d49534 /docker/base | |
| parent | 524a821577d568a7a19983a7b6adc36e78fb9e4d (diff) | |
| parent | 032804e5a0ddf89f7726880d1b57dd492d7d5c07 (diff) | |
| download | kolla-c41c6568b447e5170a953de50084dd99ddc22436.tar.gz kolla-c41c6568b447e5170a953de50084dd99ddc22436.zip | |
Merge "Be strict about errors in start"
Diffstat (limited to 'docker/base')
| -rw-r--r-- | docker/base/httpd_setup.sh | 3 | ||||
| -rw-r--r-- | docker/base/start.sh | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/docker/base/httpd_setup.sh b/docker/base/httpd_setup.sh index edb1d7df6..fe627652b 100644 --- a/docker/base/httpd_setup.sh +++ b/docker/base/httpd_setup.sh @@ -8,6 +8,9 @@ if [[ "$(whoami)" == 'root' ]]; then # NOTE(pbourke): httpd will not clean up after itself in some cases which # results in the container not being able to restart. (bug #1489676, 1557036) if [[ "${KOLLA_BASE_DISTRO}" =~ debian|ubuntu ]]; then + # NOTE(yoctozepto): APACHE_CONFDIR has to be set to pass the next step + # under the `set -o nounset` regime + APACHE_CONFDIR= # Loading Apache2 ENV variables . /etc/apache2/envvars install -d /var/run/apache2/ diff --git a/docker/base/start.sh b/docker/base/start.sh index b7ecc22ae..79d7f7c74 100644 --- a/docker/base/start.sh +++ b/docker/base/start.sh @@ -1,5 +1,8 @@ #!/bin/bash + set -o errexit +set -o pipefail +set -o nounset set -o xtrace # Processing /var/lib/kolla/config_files/config.json as root. This is necessary |