Docker/baseimage-docker
1
0
Fork 1
mirror of https://github.com/phusion/baseimage-docker.git synced 2026-03-28 13:28:10 +00:00
Code Issues Releases Wiki Activity

Merge pull request #488 from unilynx/ubuntu-1804

Browse Source 
Ubuntu 18.04
This commit is contained in:
Travis Rowland
2018-08-15 23:56:52 -07:00
committed by GitHub
parent becf747182 f802be0dfe
commit d37f7aff3f
3 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
image/Dockerfile
View File

@@ -1,4 +1,4 @@
FROM ubuntu:16.04
FROM ubuntu:18.04
MAINTAINER Phusion <info@phusion.nl>
COPY . /bd_build

13
image/services/syslog-ng/syslog-ng.conf
View File

@@ -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$");
};
########################
@@ -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); };

2
image/utilities.sh
View File

@@ -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.