Update gentoo-syslog consumers to use tail-syslog

Folks who just used the stock:

  CMD rc default && tail -F /var/log/messages

can now piggy-back on the CMD setup in the gentoo-syslog
Dockerfile.template, so I removed their CMD lines.

I updated folks that did fancier things (e.g. tweaking configs before
'rc default') to use 'exec tail-syslog' instead of 'tail -F
/var/log/messages'.

Folks that are built FROM gentoo-syslog but never used 'rc default'
should probably be FROM a more basic image, but I left them alone in
this commit.

diff --git a/buildbot/Dockerfile.template b/buildbot/Dockerfile.template
index ccf3ab8e06f2292f3d7388e8afaa9415616ad8e5..6df4a466b621fedf0a2ca9d749b66fac5eba505d 100644 (file)
--- a/buildbot/Dockerfile.template
+++ b/buildbot/Dockerfile.template
@@ -43,6 +43,5 @@ RUN mv /var/lib/buildmaster/master.cfg.sample /var/lib/buildmaster/master.cfg
 RUN buildslave create-slave /var/lib/buildslave localhost:9989 example-slave pass
 RUN chown -R buildbot:buildbot /var/lib/buildmaster /var/lib/buildslave
 
-CMD rc default && tail -F /var/log/messages
 EXPOSE 8010
 EXPOSE 9989

diff --git a/elasticsearch/Dockerfile.template b/elasticsearch/Dockerfile.template
index 0e68e20f124c4214ac3264e2cd15d7ba1001367c..e4ccfe22747f04f865e5d5a1d024ab9bd77c76d8 100644 (file)
--- a/elasticsearch/Dockerfile.template
+++ b/elasticsearch/Dockerfile.template
@@ -39,5 +39,4 @@ RUN sed -i 's/^\(appender:\)$/\1\n  syslog:\n    type: syslog\n    syslogHost: l
 # Container networking happens automatically
 RUN sed -i 's/need net$/use net/' /etc/init.d/*
 
-CMD rc default && tail -F /var/log/messages
 EXPOSE 9200

diff --git a/irker/Dockerfile.template b/irker/Dockerfile.template
index ec8dce76e6c359554fedab29a87a3265c59595e3..a82fb173be6cefe7e3e5d7f6843f8138fcf4c2cd 100644 (file)
--- a/irker/Dockerfile.template
+++ b/irker/Dockerfile.template
@@ -53,5 +53,4 @@ RUN sed -i 's/\(start-stop-daemon --stop --quiet\)/\1 --pidfile ${pidfile}/' /et
 RUN sed -i 's/#IRKERD_OPTS=""/IRKERD_OPTS="--host 0.0.0.0 --syslog"/' /etc/conf.d/irkerd
 RUN rc-update add irkerd default
 
-CMD rc default && tail -F /var/log/messages
 EXPOSE 6659

diff --git a/kibana-azure/Dockerfile.template b/kibana-azure/Dockerfile.template
index 49022a94a798d429b56ae9fa2b686b003757febd..10578621b8d233c8a938ce88e78c83799528df04 100644 (file)
--- a/kibana-azure/Dockerfile.template
+++ b/kibana-azure/Dockerfile.template
@@ -29,5 +29,5 @@ RUN wget https://github.com/wking/kibana/raw/azure-release/kibana-latest.tar.gz
 RUN tar -xvf kibana-latest.tar.gz --strip-components 1 -C /var/www/localhost/htdocs
 RUN sed -i 's|"http://"+window.location.hostname+":9200"|"ELASTICSEARCH_URL"|' /var/www/localhost/htdocs/config.js
 
-CMD sed -i "s|ELASTICSEARCH_URL|${ELASTICSEARCH_URL}|" /var/www/localhost/htdocs/config.js && rc default && tail -F /var/log/messages
+CMD sed -i "s|ELASTICSEARCH_URL|${ELASTICSEARCH_URL}|" /var/www/localhost/htdocs/config.js && rc default && exec tail-syslog
 EXPOSE 80

diff --git a/kibana/Dockerfile.template b/kibana/Dockerfile.template
index 231b316c234635638ed99c6cca92672e671a4d1c..ba8aab91a282fdf8ae3fcd6a7868adcaea38ca49 100644 (file)
--- a/kibana/Dockerfile.template
+++ b/kibana/Dockerfile.template
@@ -29,5 +29,5 @@ RUN wget https://download.elasticsearch.org/kibana/kibana/kibana-3.0.0milestone4
 RUN tar -xvf kibana-3.0.0milestone4.tar.gz --strip-components 1 -C /var/www/localhost/htdocs
 RUN sed -i 's|"http://"+window.location.hostname+":9200"|"ELASTICSEARCH_URL"|' /var/www/localhost/htdocs/config.js
 
-CMD sed -i "s|ELASTICSEARCH_URL|${ELASTICSEARCH_URL}|" /var/www/localhost/htdocs/config.js && rc default && tail -F /var/log/messages
+CMD sed -i "s|ELASTICSEARCH_URL|${ELASTICSEARCH_URL}|" /var/www/localhost/htdocs/config.js && rc default && exec tail-syslog
 EXPOSE 80

diff --git a/memcached/Dockerfile.template b/memcached/Dockerfile.template
index f983cf179fed5d5decbca2a4a099758d4c3fa836..018224f262b81519e86dfcb0d62572b1f31f28c9 100644 (file)
--- a/memcached/Dockerfile.template
+++ b/memcached/Dockerfile.template
@@ -32,5 +32,5 @@ RUN rc-update add memcached default
 # Container networking happens automatically
 RUN sed -i 's/need net$/use net/' /etc/init.d/*
 
-CMD sed -i "s/^MEMUSAGE=.*/MEMUSAGE=\"${MEMUSAGE}\"/" /etc/conf.d/memcached && rc default && tail -F /var/log/messages
+CMD sed -i "s/^MEMUSAGE=.*/MEMUSAGE=\"${MEMUSAGE}\"/" /etc/conf.d/memcached && rc default && exec tail-syslog
 EXPOSE 11211

diff --git a/nginx-proxy/Dockerfile.template b/nginx-proxy/Dockerfile.template
index dc4ce1da95c8ef8e91b9362baeb347d1685fe1de..ea110dcd1bdf0acb86ef175f94c7a9cbbb7f07f5 100644 (file)
--- a/nginx-proxy/Dockerfile.template
+++ b/nginx-proxy/Dockerfile.template
@@ -37,5 +37,5 @@ ADD create-vhosts-from-environment.sh /usr/bin/create-vhosts-from-environment
 RUN sed -i 's/^\t#\([^ ]\)/\t\1/' /etc/nginx/nginx.conf
 RUN sed -i 's/listen 127.0.0.1:443;/listen 443 default_server;/' /etc/nginx/nginx.conf
 
-CMD create-vhosts-from-environment && rc default && tail -F /var/log/messages
+CMD create-vhosts-from-environment && rc default && exec tail-syslog
 EXPOSE 443

diff --git a/nginx/Dockerfile.template b/nginx/Dockerfile.template
index 53e563edb631af06d5461b921d0fe4514ca4bc49..7ba73a31453b8fcb751650b21d223623f8e9a851 100644 (file)
--- a/nginx/Dockerfile.template
+++ b/nginx/Dockerfile.template
@@ -38,5 +38,4 @@ RUN mkdir /var/www/localhost/htdocs
 # Container networking happens automatically
 RUN sed -i 's/need net$/use net/' /etc/init.d/*
 
-CMD rc default && tail -F /var/log/messages
 EXPOSE 80

diff --git a/ngircd/Dockerfile.template b/ngircd/Dockerfile.template
index d2ab8b527d410d50c5cece9962ca51ec0d92b3a7..5d1200924875d44b94299b258689e0d80f6c2fd7 100644 (file)
--- a/ngircd/Dockerfile.template
+++ b/ngircd/Dockerfile.template
@@ -45,5 +45,5 @@ RUN sed -i 's/Info = Server Info Text/Info = ${INFO}/' /etc/ngircd/ngircd.conf
 # Container networking happens automatically
 RUN sed -i 's/need net$/use net/' /etc/init.d/*
 
-CMD setup-ngircd-config-from-environment && rc default && tail -F /var/log/messages
+CMD setup-ngircd-config-from-environment && rc default && exec tail-syslog
 EXPOSE 6667

diff --git a/package-cache/Dockerfile.template b/package-cache/Dockerfile.template
index 8cb58c7223dcda6048ddf447cc2840a8786f12a7..d9771fa7c36b65f7c956fcca677d024f7303d830 100644 (file)
--- a/package-cache/Dockerfile.template
+++ b/package-cache/Dockerfile.template
@@ -40,5 +40,4 @@ Run echo 'PC_GROUP="root"' >> /etc/conf.d/package-cache
 # Container networking happens automatically
 RUN sed -i 's/need net$/use net/' /etc/init.d/*
 
-CMD rc default && tail -F /var/log/messages
 EXPOSE 80

diff --git a/postgresql/Dockerfile.template b/postgresql/Dockerfile.template
index d7010dc398edfe9f4ca7bcf14ef02c1e47234ee4..c01b264a7acbe5d1f1f785699c3f7fbd62700bdc 100644 (file)
--- a/postgresql/Dockerfile.template
+++ b/postgresql/Dockerfile.template
@@ -41,5 +41,4 @@ RUN sed -i "s/\(#log_destination =.*\)/log_destination = 'syslog'\n\1/" /etc/pos
 # Container networking happens automatically
 RUN sed -i 's/need net$/use net/' /etc/init.d/*
 
-CMD rc default && tail -F /var/log/messages
 EXPOSE 5432

diff --git a/redis/Dockerfile.template b/redis/Dockerfile.template
index b926faec49acbc3974a71a7332af8a2dfd4cc260..2cb2886cbc72e98550e996c9e495450a8e04cc6d 100644 (file)
--- a/redis/Dockerfile.template
+++ b/redis/Dockerfile.template
@@ -41,5 +41,4 @@ RUN sed -i 's/\(# maxmemory-policy.*\)/\1\nmaxmemory-policy allkeys-lru/' /etc/r
 RUN sed -i 's/^\(logfile.*\)/# \1/' /etc/redis.conf
 RUN sed -i 's/\(# syslog-enabled.*\)/\1\nsyslog-enabled yes/' /etc/redis.conf
 
-CMD rc default && tail -F /var/log/messages
 EXPOSE 6379

diff --git a/salt-minion/Dockerfile.template b/salt-minion/Dockerfile.template
index 6d91498b807489666e1445157a58485a4f331f22..1f58b6cc35a5074447e37731167c75ea0403cf07 100644 (file)
--- a/salt-minion/Dockerfile.template
+++ b/salt-minion/Dockerfile.template
@@ -64,5 +64,4 @@ RUN sed -i 's|^\(#log_level_logfile:.*\)$|\1\nlog_level_logfile: info|' /etc/sal
 # Container networking happens automatically
 RUN sed -i 's/need net$/use net/' /etc/init.d/*
 
-CMD rc default && tail -F /var/log/messages
 EXPOSE 80

diff --git a/stunnel/Dockerfile.template b/stunnel/Dockerfile.template
index 2074174fa5c4ff67c5ca68fd67b22f641385aa99..e0d7731649b97f3b4692280633eba28edcc17d3a 100644 (file)
--- a/stunnel/Dockerfile.template
+++ b/stunnel/Dockerfile.template
@@ -39,5 +39,5 @@ RUN echo 'connect = NETLOC' >> /etc/stunnel/stunnel.conf
 # Container networking happens automatically
 RUN sed -i 's/need net$/use net/' /etc/init.d/*
 
-CMD sed -i "s|NETLOC|${SERVER_PORT#tcp://}|" /etc/stunnel/stunnel.conf && rc default && tail -F /var/log/messages
+CMD sed -i "s|NETLOC|${SERVER_PORT#tcp://}|" /etc/stunnel/stunnel.conf && rc default && exec tail-syslog
 EXPOSE 9999