diff options
| author | zhubingbing <zhu.bingbing@99cloud.net> | 2017-01-10 05:57:51 +0000 |
|---|---|---|
| committer | zhubingbing <zhu.bingbing@99cloud.net> | 2017-01-10 08:07:25 +0000 |
| commit | d459d80b9ef26a13d2be6e761c8a16cd2e02c998 (patch) | |
| tree | da449f6c1b2d8a2f0049dca40e5d673aaae00702 | |
| parent | 95bb052fe75117ccad3d435c8af58bd3b74f0ee2 (diff) | |
| download | kolla-d459d80b9ef26a13d2be6e761c8a16cd2e02c998.tar.gz kolla-d459d80b9ef26a13d2be6e761c8a16cd2e02c998.zip | |
Fix kuryr container
Add log directory,add missing chmod 755 /usr/local/bin/kolla_extend_start
Closes-Bug: #1655250
Change-Id: Iaebd5935063a4420d093abd6815d20e704be170b
| -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 |