From 43791943e5fa56103d4ee1b8af184e407561eeba Mon Sep 17 00:00:00 2001 From: Arnold Hendriks Date: Fri, 27 Apr 2018 20:36:13 +0200 Subject: [PATCH 1/4] Update the baseimage to use, see https://hub.docker.com/r/library/ubuntu/tags/ Taking the bionic tag because so far the 'latest' and 18.04 tags haven't been updated yet --- image/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/image/Dockerfile b/image/Dockerfile index f72dde3..dfb2ba4 100644 --- a/image/Dockerfile +++ b/image/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:16.04 +FROM ubuntu:bionic-20180426 MAINTAINER Phusion COPY . /bd_build From f936902c23e4e14e2fdbc496aba23664d103406e Mon Sep 17 00:00:00 2001 From: Arnold Hendriks Date: Mon, 9 Apr 2018 23:06:21 +0200 Subject: [PATCH 2/4] Update syslog configuration (took the diff between stock 16.04 and phusion 16.04 to figure out what to apply to the stock 18.04 syslog conf) as it complains about old config format --- image/services/syslog-ng/syslog-ng.conf | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/image/services/syslog-ng/syslog-ng.conf b/image/services/syslog-ng/syslog-ng.conf index b92d852..543eb05 100644 --- a/image/services/syslog-ng/syslog-ng.conf +++ b/image/services/syslog-ng/syslog-ng.conf @@ -1,14 +1,13 @@ -@version: 3.5 +@version: 3.13 @include "scl.conf" -@include "`scl-root`/system/tty10.conf" # Syslog-ng configuration file, compatible with default Debian syslogd # installation. # First, set some global options. options { chain_hostnames(off); flush_lines(0); use_dns(no); use_fqdn(no); - owner("root"); group("adm"); perm(0640); stats_freq(0); - bad_hostname("^gconfd$"); + owner("root"); group("adm"); perm(0640); stats_freq(0); + bad_hostname("^gconfd$"); }; ######################## @@ -54,7 +53,7 @@ destination d_newscrit { file("/var/log/news/news.crit"); }; destination d_newserr { file("/var/log/news/news.err"); }; destination d_newsnotice { file("/var/log/news/news.notice"); }; -# Some `catch-all' logfiles. +# Some 'catch-all' logfiles. # destination d_debug { file("/var/log/debug"); }; destination d_error { file("/var/log/error"); }; @@ -80,7 +79,7 @@ destination d_stdout { ##SYSLOG_OUTPUT_MODE_DEV_STDOUT##("/dev/stdout"); }; ######################## # Filters ######################## -# Here's come the filter options. With this rules, we can set which +# Here's come the filter options. With this rules, we can set which # message go where. filter f_dbg { level(debug); }; @@ -92,7 +91,7 @@ filter f_crit { level(crit .. emerg); }; filter f_debug { level(debug) and not facility(auth, authpriv, news, mail); }; filter f_error { level(err .. emerg) ; }; -filter f_messages { level(info,notice,warn) and +filter f_messages { level(info,notice,warn) and not facility(auth,authpriv,cron,daemon,mail,news); }; filter f_auth { facility(auth, authpriv) and not filter(f_debug); }; @@ -134,6 +133,8 @@ log { source(s_src); filter(f_mail); destination(d_mail); }; log { source(s_src); filter(f_news); filter(f_crit); destination(d_newscrit); }; log { source(s_src); filter(f_news); filter(f_err); destination(d_newserr); }; log { source(s_src); filter(f_news); filter(f_notice); destination(d_newsnotice); }; +#log { source(s_src); filter(f_cnews); destination(d_console_all); }; +#log { source(s_src); filter(f_cother); destination(d_console_all); }; #log { source(s_src); filter(f_ppp); destination(d_ppp); }; From d796c2e32c333017db0963c7b556719fa0a339ee Mon Sep 17 00:00:00 2001 From: Arnold Hendriks Date: Fri, 27 Apr 2018 16:03:27 +0200 Subject: [PATCH 3/4] Add gpg-agent and dirmngr so 'apt-key' works out of the box again, just like it did on the 16.04 phusion image --- image/utilities.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/image/utilities.sh b/image/utilities.sh index d1aa273..d8c9555 100755 --- a/image/utilities.sh +++ b/image/utilities.sh @@ -4,7 +4,7 @@ source /bd_build/buildconfig set -x ## Often used tools. -$minimal_apt_get_install curl less vim-tiny psmisc +$minimal_apt_get_install curl less vim-tiny psmisc gpg-agent dirmngr ln -s /usr/bin/vim.tiny /usr/bin/vim ## This tool runs a command as another user and sets $HOME. From 5493db5179eb36451d87a46445fc7ee876110944 Mon Sep 17 00:00:00 2001 From: Travis Rowland Date: Wed, 15 Aug 2018 23:54:56 -0700 Subject: [PATCH 4/4] Update Dockerfile --- image/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/image/Dockerfile b/image/Dockerfile index dfb2ba4..da5b41d 100644 --- a/image/Dockerfile +++ b/image/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:bionic-20180426 +FROM ubuntu:18.04 MAINTAINER Phusion COPY . /bd_build