diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-08-09 12:08:04 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-08-09 12:08:04 +0000 |
| commit | 06d0c29a3e185864da1d6cbf6879a04cca7e71d6 (patch) | |
| tree | 3fdc67802f8f729879d6dfa56df869e6b931a2c9 | |
| parent | ce6e4e3fe2d46651bf44de9ee44764ec55f1593e (diff) | |
| parent | 685cbdaa4fcf8d54aab8e793133ff693dab395f3 (diff) | |
| download | kolla-06d0c29a3e185864da1d6cbf6879a04cca7e71d6.tar.gz kolla-06d0c29a3e185864da1d6cbf6879a04cca7e71d6.zip | |
Merge "Skydive: Add log directory"
| -rw-r--r-- | docker/skydive/skydive-base/Dockerfile.j2 | 3 | ||||
| -rw-r--r-- | docker/skydive/skydive-base/extend_start.sh | 8 |
2 files changed, 11 insertions, 0 deletions
diff --git a/docker/skydive/skydive-base/Dockerfile.j2 b/docker/skydive/skydive-base/Dockerfile.j2 index b42a00be6..7e802c6fa 100644 --- a/docker/skydive/skydive-base/Dockerfile.j2 +++ b/docker/skydive/skydive-base/Dockerfile.j2 @@ -16,5 +16,8 @@ RUN curl -o /usr/bin/skydive -L "https://github.com/skydive-project/skydive/rele {% endif %} +COPY extend_start.sh /usr/local/bin/kolla_extend_start +RUN chmod 755 /usr/local/bin/kolla_extend_start + {% block skydive_base_footer %}{% endblock %} {% block footer %}{% endblock %} diff --git a/docker/skydive/skydive-base/extend_start.sh b/docker/skydive/skydive-base/extend_start.sh new file mode 100644 index 000000000..7d9bfb418 --- /dev/null +++ b/docker/skydive/skydive-base/extend_start.sh @@ -0,0 +1,8 @@ +#!/bin/bash + +if [[ ! -d "/var/log/kolla/skydive" ]]; then + mkdir -p /var/log/kolla/skydive +fi +if [[ $(stat -c %a /var/log/kolla/skydive) != "755" ]]; then + chmod 755 /var/log/kolla/skydive +fi |