From f70050d828d1ec1f8b393c19e5d7f86027e27203 Mon Sep 17 00:00:00 2001 From: Aleksandr Didenko Date: Wed, 30 Apr 2014 15:32:51 +0300 Subject: [PATCH] Install logrotate in our containers We will need logrotate package to rotate logs inside containers Change-Id: I11eee08fb2ff105dd74760c2960e9110f976d123 --- docker/astute/Dockerfile | 2 +- docker/cobbler/Dockerfile | 2 +- docker/mcollective/Dockerfile | 2 +- docker/nailgun/Dockerfile | 2 +- docker/nginx/Dockerfile | 2 +- docker/ostf/Dockerfile | 2 +- docker/postgres/Dockerfile | 2 +- docker/rabbitmq/Dockerfile | 2 +- docker/rsync/Dockerfile | 2 +- docker/rsyslog/Dockerfile | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/docker/astute/Dockerfile b/docker/astute/Dockerfile index 44e264ab3..69e71d025 100644 --- a/docker/astute/Dockerfile +++ b/docker/astute/Dockerfile @@ -10,7 +10,7 @@ WORKDIR /root RUN rm -rf /etc/yum.repos.d/* RUN echo -e "[nailgun]\nname=Nailgun Local Repo\nbaseurl=http://$(route -n | awk '/^0.0.0.0/ { print $2 }'):_PORT_/os/x86_64/\ngpgcheck=0" > /etc/yum.repos.d/nailgun.repo RUN yum clean all -RUN yum --quiet install -y ruby21-puppet ruby21-nailgun-mcagents +RUN yum --quiet install -y ruby21-puppet ruby21-nailgun-mcagents logrotate #FIXME(mattymo): workaround until astute has this dependency RUN yum --quiet install -y openssh-clients diff --git a/docker/cobbler/Dockerfile b/docker/cobbler/Dockerfile index ea9ee91e8..d26aea23c 100644 --- a/docker/cobbler/Dockerfile +++ b/docker/cobbler/Dockerfile @@ -10,7 +10,7 @@ WORKDIR /root RUN rm -rf /etc/yum.repos.d/* RUN echo -e "[nailgun]\nname=Nailgun Local Repo\nbaseurl=http://$(route -n | awk '/^0.0.0.0/ { print $2 }'):_PORT_/os/x86_64/\ngpgcheck=0" > /etc/yum.repos.d/nailgun.repo RUN yum clean all -RUN yum --quiet install -y ruby21-puppet +RUN yum --quiet install -y ruby21-puppet logrotate RUN yum --quiet install -y httpd cobbler dnsmasq xinetd tftp-server ADD etc /etc diff --git a/docker/mcollective/Dockerfile b/docker/mcollective/Dockerfile index b81e5e3c1..624de02aa 100644 --- a/docker/mcollective/Dockerfile +++ b/docker/mcollective/Dockerfile @@ -7,7 +7,7 @@ WORKDIR /root RUN rm -rf /etc/yum.repos.d/* RUN echo -e "[nailgun]\nname=Nailgun Local Repo\nbaseurl=http://$(route -n | awk '/^0.0.0.0/ { print $2 }'):_PORT_/os/x86_64/\ngpgcheck=0" > /etc/yum.repos.d/nailgun.repo RUN yum clean all -RUN yum --quiet install -y ruby21-puppet sudo ruby21-mcollective +RUN yum --quiet install -y ruby21-puppet sudo ruby21-mcollective logrotate ADD etc /etc diff --git a/docker/nailgun/Dockerfile b/docker/nailgun/Dockerfile index af3b6ea8b..5da7d9134 100644 --- a/docker/nailgun/Dockerfile +++ b/docker/nailgun/Dockerfile @@ -10,7 +10,7 @@ WORKDIR /root RUN rm -rf /etc/yum.repos.d/* RUN echo -e "[nailgun]\nname=Nailgun Local Repo\nbaseurl=http://$(route -n | awk '/^0.0.0.0/ { print $2 }'):_PORT_/os/x86_64/\ngpgcheck=0" > /etc/yum.repos.d/nailgun.repo RUN yum clean all -RUN yum --quiet install -y ruby21-puppet +RUN yum --quiet install -y ruby21-puppet logrotate RUN mkdir -p /opt/gateone/users/ANONYMOUS/ RUN mkdir -p /var/log/nailgun diff --git a/docker/nginx/Dockerfile b/docker/nginx/Dockerfile index 091875486..49b5f2d86 100644 --- a/docker/nginx/Dockerfile +++ b/docker/nginx/Dockerfile @@ -11,7 +11,7 @@ WORKDIR /root RUN rm -rf /etc/yum.repos.d/* RUN echo -e "[nailgun]\nname=Nailgun Local Repo\nbaseurl=http://$(route -n | awk '/^0.0.0.0/ { print $2 }'):_PORT_/os/x86_64/\ngpgcheck=0" > /etc/yum.repos.d/nailgun.repo RUN yum clean all -RUN yum --quiet install -y ruby21-puppet +RUN yum --quiet install -y ruby21-puppet logrotate RUN yum --quiet -y install nginx ADD etc /etc diff --git a/docker/ostf/Dockerfile b/docker/ostf/Dockerfile index e2c44041c..38b84d490 100644 --- a/docker/ostf/Dockerfile +++ b/docker/ostf/Dockerfile @@ -10,7 +10,7 @@ WORKDIR /root RUN rm -rf /etc/yum.repos.d/* RUN echo -e "[nailgun]\nname=Nailgun Local Repo\nbaseurl=http://$(route -n | awk '/^0.0.0.0/ { print $2 }'):_PORT_/os/x86_64/\ngpgcheck=0" > /etc/yum.repos.d/nailgun.repo RUN yum clean all -RUN yum --quiet install -y ruby21-puppet +RUN yum --quiet install -y ruby21-puppet logrotate RUN yum --quiet install -y python-fuelclient supervisor postgresql-libs ADD etc /etc diff --git a/docker/postgres/Dockerfile b/docker/postgres/Dockerfile index 03198c812..251797b6a 100644 --- a/docker/postgres/Dockerfile +++ b/docker/postgres/Dockerfile @@ -7,7 +7,7 @@ WORKDIR /root RUN rm -rf /etc/yum.repos.d/* RUN echo -e "[nailgun]\nname=Nailgun Local Repo\nbaseurl=http://$(route -n | awk '/^0.0.0.0/ { print $2 }'):_PORT_/os/x86_64/\ngpgcheck=0" > /etc/yum.repos.d/nailgun.repo RUN yum clean all -RUN yum --quiet install -y ruby21-puppet sudo +RUN yum --quiet install -y ruby21-puppet sudo logrotate ADD etc /etc diff --git a/docker/rabbitmq/Dockerfile b/docker/rabbitmq/Dockerfile index 31c6a112e..eb88d771a 100644 --- a/docker/rabbitmq/Dockerfile +++ b/docker/rabbitmq/Dockerfile @@ -7,7 +7,7 @@ WORKDIR /root RUN rm -rf /etc/yum.repos.d/* RUN echo -e "[nailgun]\nname=Nailgun Local Repo\nbaseurl=http://$(route -n | awk '/^0.0.0.0/ { print $2 }'):_PORT_/os/x86_64/\ngpgcheck=0" > /etc/yum.repos.d/nailgun.repo RUN yum clean all -RUN yum --quiet install -y ruby21-puppet rabbitmq-server +RUN yum --quiet install -y ruby21-puppet rabbitmq-server logrotate ADD etc /etc diff --git a/docker/rsync/Dockerfile b/docker/rsync/Dockerfile index 77cb50a54..5601c3536 100644 --- a/docker/rsync/Dockerfile +++ b/docker/rsync/Dockerfile @@ -11,7 +11,7 @@ WORKDIR /root RUN rm -rf /etc/yum.repos.d/* RUN echo -e "[nailgun]\nname=Nailgun Local Repo\nbaseurl=http://$(route -n | awk '/^0.0.0.0/ { print $2 }'):_PORT_/os/x86_64/\ngpgcheck=0" > /etc/yum.repos.d/nailgun.repo RUN yum clean all -RUN yum --quiet install -y ruby21-puppet xinetd rsync +RUN yum --quiet install -y ruby21-puppet xinetd rsync logrotate ADD etc /etc RUN puppet apply -v /etc/puppet/modules/nailgun/examples/puppetsync-only.pp diff --git a/docker/rsyslog/Dockerfile b/docker/rsyslog/Dockerfile index b18555cd1..857149ba9 100644 --- a/docker/rsyslog/Dockerfile +++ b/docker/rsyslog/Dockerfile @@ -7,7 +7,7 @@ WORKDIR /root RUN rm -rf /etc/yum.repos.d/* RUN echo -e "[nailgun]\nname=Nailgun Local Repo\nbaseurl=http://$(route -n | awk '/^0.0.0.0/ { print $2 }'):_PORT_/os/x86_64/\ngpgcheck=0" > /etc/yum.repos.d/nailgun.repo RUN yum clean all -RUN yum --quiet install -y ruby21-puppet anacron rsyslog +RUN yum --quiet install -y ruby21-puppet anacron rsyslog logrotate ADD etc /etc