Docker/baseimage-docker
1
0
Fork 1
mirror of https://github.com/phusion/baseimage-docker.git synced 2026-03-26 12:29:07 +00:00
Code Issues Releases Wiki Activity

Compare commits

base: Docker:0.10.2
Branches Tags
Docker:master Docker:copilot/fix-gh-release-403-error Docker:copilot/create-gh-releases-for-images Docker:gh-pages
Docker:noble-1.0.2 Docker:noble-1.0.1 Docker:noble-1.0.0 Docker:jammy-1.0.4 Docker:jammy-1.0.3 Docker:jammy-1.0.2 Docker:jammy-1.0.1 Docker:dev-jammy-1.1.0 Docker:jammy-1.0.0 Docker:focal-1.2.0 Docker:focal-1.0.0 Docker:focal-1.0.0-alpha1 Docker:focal-1.0.0alpha1 Docker:18.04-1.0.0 Docker:bionic-1.0.0 Docker:0.11 Docker:0.10.2 Docker:0.9.19-armhf Docker:0.10.1 Docker:0.10.0 Docker:0.9.22 Docker:0.9.21 Docker:0.9.20 Docker:rel-0.9.19 Docker:rel-0.9.18 Docker:rel-0.9.17 Docker:rel-0.9.16 Docker:rel-0.9.15 Docker:rel-0.9.14 Docker:rel-0.9.13 Docker:rel-0.9.12 Docker:rel-0.9.11 Docker:rel-0.9.10 Docker:rel-0.9.9 Docker:rel-0.9.8 Docker:rel-0.9.7 Docker:rel-0.9.6 Docker:rel-0.9.5 Docker:rel-0.9.4 Docker:rel-0.9.3 Docker:rel-0.9.2 Docker:rel-0.9.1 Docker:rel-0.9.0
..
compare: Docker:0.11
Branches Tags
Docker:master Docker:copilot/fix-gh-release-403-error Docker:copilot/create-gh-releases-for-images Docker:gh-pages
Docker:noble-1.0.2 Docker:noble-1.0.1 Docker:noble-1.0.0 Docker:jammy-1.0.4 Docker:jammy-1.0.3 Docker:jammy-1.0.2 Docker:jammy-1.0.1 Docker:dev-jammy-1.1.0 Docker:jammy-1.0.0 Docker:focal-1.2.0 Docker:focal-1.0.0 Docker:focal-1.0.0-alpha1 Docker:focal-1.0.0alpha1 Docker:18.04-1.0.0 Docker:bionic-1.0.0 Docker:0.11 Docker:0.10.2 Docker:0.9.19-armhf Docker:0.10.1 Docker:0.10.0 Docker:0.9.22 Docker:0.9.21 Docker:0.9.20 Docker:rel-0.9.19 Docker:rel-0.9.18 Docker:rel-0.9.17 Docker:rel-0.9.16 Docker:rel-0.9.15 Docker:rel-0.9.14 Docker:rel-0.9.13 Docker:rel-0.9.12 Docker:rel-0.9.11 Docker:rel-0.9.10 Docker:rel-0.9.9 Docker:rel-0.9.8 Docker:rel-0.9.7 Docker:rel-0.9.6 Docker:rel-0.9.5 Docker:rel-0.9.4 Docker:rel-0.9.3 Docker:rel-0.9.2 Docker:rel-0.9.1 Docker:rel-0.9.0

8 Commits
0.10.2 ... 0.11

Author SHA1 Message Date
Travis Rowland
e8d48f3af4 Update Makefile 2018-08-16 00:01:31 -07:00
Travis Rowland
d37f7aff3f Merge pull request #488 from unilynx/ubuntu-1804 
Ubuntu 18.04
 2018-08-15 23:56:52 -07:00
Travis Rowland
f802be0dfe Merge branch 'master' into ubuntu-1804 2018-08-15 23:55:47 -07:00
Travis Rowland
5493db5179 Update Dockerfile 2018-08-15 23:54:56 -07:00
Travis Rowland
0c9eaf3c43 Merge branch 'master' into ubuntu-1804 2018-08-13 10:11:30 -07:00
Arnold Hendriks
d796c2e32c Add gpg-agent and dirmngr so 'apt-key' works out of the box again, just like it did on the 16.04 phusion image 2018-04-27 20:40:49 +02:00
Arnold Hendriks
f936902c23 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 2018-04-27 20:40:49 +02:00
Arnold Hendriks
43791943e5 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
 2018-04-27 20:40:48 +02:00
4 changed files with 10 additions and 9 deletions
Expand all files Collapse all files

2
Makefile
View File

@@ -1,5 +1,5 @@
NAME = phusion/baseimage NAME = phusion/baseimage
VERSION = 0.10.2 VERSION = 0.11
.PHONY: all build test tag_latest release ssh .PHONY: all build test tag_latest release ssh

2
image/Dockerfile
View File

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

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

@@ -1,6 +1,5 @@
@version: 3.5 @version: 3.13
@include "scl.conf" @include "scl.conf"
@include "`scl-root`/system/tty10.conf"
# Syslog-ng configuration file, compatible with default Debian syslogd # Syslog-ng configuration file, compatible with default Debian syslogd
# installation. # installation.
@@ -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_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_err); destination(d_newserr); };
log { source(s_src); filter(f_news); filter(f_notice); destination(d_newsnotice); }; 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); }; #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 set -x
## Often used tools. ## 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 ln -s /usr/bin/vim.tiny /usr/bin/vim
## This tool runs a command as another user and sets $HOME. ## This tool runs a command as another user and sets $HOME.