diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-10-07 09:58:34 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-10-07 09:58:34 +0000 |
| commit | 05764198a2045e5d8516117ada833630ae5d892c (patch) | |
| tree | c1dd1bd7aa6996f0854d3d715e062c81e3b54cfb /docker | |
| parent | ec835750e72c6a63e5e17dcae07b1fc6a3f8b466 (diff) | |
| parent | 865ba802317f1680b1e70f001bf95e3f9fa8a2c4 (diff) | |
| download | kolla-05764198a2045e5d8516117ada833630ae5d892c.tar.gz kolla-05764198a2045e5d8516117ada833630ae5d892c.zip | |
Merge "Removing /dev/log on rsyslog start"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/logging/rsyslog/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/logging/rsyslog/extend_start.sh | 5 |
2 files changed, 7 insertions, 0 deletions
diff --git a/docker/logging/rsyslog/Dockerfile.j2 b/docker/logging/rsyslog/Dockerfile.j2 index db58b799a..c74aecaf2 100644 --- a/docker/logging/rsyslog/Dockerfile.j2 +++ b/docker/logging/rsyslog/Dockerfile.j2 @@ -13,4 +13,6 @@ RUN apt-get install -y --no-install-recommends rsyslog \ {% endif %} +COPY extend_start.sh /usr/local/bin/kolla_extend_start + {{ include_footer }} diff --git a/docker/logging/rsyslog/extend_start.sh b/docker/logging/rsyslog/extend_start.sh new file mode 100644 index 000000000..0742fa0a2 --- /dev/null +++ b/docker/logging/rsyslog/extend_start.sh @@ -0,0 +1,5 @@ +#!/bin/bash + +if [[ -e "/dev/log" ]]; then + rm -rf /dev/log +fi |