diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-01-10 14:57:14 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-01-10 14:57:14 +0000 |
| commit | 3fa48444b5a1796ad71345027d1f10127790ed2c (patch) | |
| tree | de569dbef227282c64c40742a01d5266a0c8fc4a | |
| parent | a43e7792d4d39ae7ea5ab9588747ece66107ffe6 (diff) | |
| parent | d459d80b9ef26a13d2be6e761c8a16cd2e02c998 (diff) | |
| download | kolla-3fa48444b5a1796ad71345027d1f10127790ed2c.tar.gz kolla-3fa48444b5a1796ad71345027d1f10127790ed2c.zip | |
Merge "Fix kuryr container"
| -rw-r--r-- | docker/kuryr/kuryr-base/Dockerfile.j2 | 1 | ||||
| -rw-r--r-- | docker/kuryr/kuryr-base/extend_start.sh | 9 |
2 files changed, 10 insertions, 0 deletions
diff --git a/docker/kuryr/kuryr-base/Dockerfile.j2 b/docker/kuryr/kuryr-base/Dockerfile.j2 index 1269bced8..ece66c7d9 100644 --- a/docker/kuryr/kuryr-base/Dockerfile.j2 +++ b/docker/kuryr/kuryr-base/Dockerfile.j2 @@ -20,5 +20,6 @@ RUN ln -s kuryr-base-source/* kuryr-base \ {% endif %} COPY extend_start.sh /usr/local/bin/kolla_extend_start +RUN chmod 755 /usr/local/bin/kolla_extend_start {% block kuryr_base_footer %}{% endblock %} diff --git a/docker/kuryr/kuryr-base/extend_start.sh b/docker/kuryr/kuryr-base/extend_start.sh index ee7045d04..214675bea 100644 --- a/docker/kuryr/kuryr-base/extend_start.sh +++ b/docker/kuryr/kuryr-base/extend_start.sh @@ -1,5 +1,14 @@ #!/bin/bash +KURYR_LOG_DIR=/var/log/kolla/kuryr + +if [[ ! -d "${KURYR_LOG_DIR}" ]]; then + mkdir -p ${KURYR_LOG_DIR} +fi +if [[ $(stat -c %a ${KURYR_LOG_DIR}) != "755" ]]; then + chmod 755 ${KURYR_LOG_DIR} +fi + if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then mkdir -p /usr/lib/docker/plugins/kuryr exit 0 |