diff options
Diffstat (limited to 'docker/logging')
| -rw-r--r--[-rwxr-xr-x] | docker/logging/rsyslog/Dockerfile.j2 | 13 | ||||
| -rwxr-xr-x | docker/logging/rsyslog/start.sh | 7 |
2 files changed, 6 insertions, 14 deletions
diff --git a/docker/logging/rsyslog/Dockerfile.j2 b/docker/logging/rsyslog/Dockerfile.j2 index 60b81b5ba..db58b799a 100755..100644 --- a/docker/logging/rsyslog/Dockerfile.j2 +++ b/docker/logging/rsyslog/Dockerfile.j2 @@ -3,15 +3,14 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla) {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} -RUN yum -y install \ - rsyslog \ +RUN yum -y install rsyslog \ && yum clean all + {% elif base_distro in ['ubuntu', 'debian'] %} -RUN apt-get install -y --no-install-recommends \ - rsyslog \ + +RUN apt-get install -y --no-install-recommends rsyslog \ && apt-get clean -{% endif %} -COPY start.sh / +{% endif %} -CMD ["/start.sh"] +{{ include_footer }} diff --git a/docker/logging/rsyslog/start.sh b/docker/logging/rsyslog/start.sh deleted file mode 100755 index fea488a62..000000000 --- a/docker/logging/rsyslog/start.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash -set -o errexit - -# Loading common functions. -source /opt/kolla/kolla-common.sh - -exec $CMD $ARGS |
