1
0
mirror of https://github.com/phusion/baseimage-docker.git synced 2026-03-26 12:29:07 +00:00

Compare commits

..

77 Commits

Author SHA1 Message Date
Travis Rowland
becf747182 Update Makefile 2018-08-15 23:47:10 -07:00
Travis Rowland
673cd89f41 Merge pull request #501 from davidbernick/bernick_18.04
syslog fix
2018-07-18 08:18:17 -07:00
Travis Rowland
8cf2e208ff Merge branch 'master' into bernick_18.04 2018-07-18 08:17:52 -07:00
Travis Rowland
924f874d7e Update Dockerfile 2018-07-18 08:17:29 -07:00
Travis Rowland
b89b718067 Merge pull request #497 from rwky/logrotate-permissions-fix
Fix /var/log permissions on syslog-ng startup
2018-07-18 08:09:40 -07:00
Travis Rowland
422781c7cf Merge branch 'master' into logrotate-permissions-fix 2018-07-18 08:08:34 -07:00
Travis Rowland
ed15d0d250 Merge pull request #487 from unilynx/support-maketest-on-osx
Allow 'make test' to work on macOS by publishing the SSH port
2018-07-18 07:45:32 -07:00
David Bernick
a018aba0c2 syslog fix 2018-07-16 12:46:18 -04:00
Rowan Wookey
dd9d23f1ea Fix /var/log permissions on syslog-ng startup 2018-06-30 10:58:14 +01:00
Arnold Hendriks
2f0e1ad0b8 Allow 'make test' to work on macOS by publishing the SSH port and using that during tests, as the IP address cannot be directly reached on macOS docker 2018-04-09 23:08:01 +02:00
Travis Rowland
92a357a41f Merge pull request #478 from andres-h/master
fix syslog reload
2018-04-02 00:49:31 -07:00
Travis Rowland
996e31b743 Incrementing version AFFECTS #485 2018-04-02 00:25:08 -07:00
Andres Heinloo
cb8cd8ad82 fix syslog reload 2018-03-16 18:24:00 +01:00
Floor Drees
69a8fc1246 update Code of Conduct with contact persons 2018-03-05 10:30:11 +01:00
Travis Rowland
12718e6954 Merge pull request #470 from davidhiendl/master
fixed syslog warning when using --tty as described in #468
2018-03-04 19:53:43 -03:00
David Hiendl
be8fc49e52 fixed syslog warning when using --tty as described in #468 2018-02-22 08:53:27 +01:00
Travis Rowland
14896d9181 Merge pull request #466 from phusion/readme-fix
removed syslog-forwarder from readme
2018-02-19 17:13:21 -08:00
Zsolt Ero
9d63ae751c RAM usage updated in readme 2018-02-17 02:28:14 +01:00
Zsolt Ero
c5b6ed442d readme fix 2018-02-17 02:05:21 +01:00
Zsolt Ero
c40591ee2c removed syslog-forwarder from readme 2018-02-17 02:03:32 +01:00
Travis Rowland
be5d910bad Merge pull request #445 from phusion/Theaxiom-patch-1
my_init exits with 0 on SIGINT after runit is started
2018-01-31 23:09:55 -08:00
Travis Rowland
db73c10615 Merge branch 'master' into Theaxiom-patch-1 2018-01-31 22:57:45 -08:00
Travis Rowland
733dac8706 Merge pull request #465 from rdxmb/master
README.md -> fix SSH docs
2018-01-31 22:56:16 -08:00
Marc Bihlmaier
768d4b4d3f fix SSH README.md 2018-01-31 11:33:17 +01:00
rdxmb
b20ebe448c Merge pull request #1 from phusion/master
Rebase
2018-01-31 11:18:19 +01:00
Travis Rowland
adf8fd7805 Latest tag not yet necessary 2018-01-26 02:51:52 -08:00
Travis Rowland
670f189553 Merge pull request #463 from phusion/ci-test
Ci test
2018-01-26 02:44:52 -08:00
Travis Rowland
e81e664a72 Push master as latest 2018-01-26 02:36:46 -08:00
Travis Rowland
6b8be06bba GitLab CI is better 2018-01-26 02:26:03 -08:00
Travis Rowland
efc5865789 Was using incorrect variable replacements 2018-01-26 02:17:56 -08:00
Travis Rowland
300b96fb93 build local Dockerfile 2018-01-26 02:01:09 -08:00
Travis Rowland
1bffe76e6a don't remove image 2018-01-26 01:58:22 -08:00
Travis Rowland
7a639692ab Automated Docker builds 2018-01-26 01:54:38 -08:00
Travis Rowland
fdfe6b1937 Merge pull request #449 from phusion/Theaxiom-patch-2
Incrementing version AFFECTS #448
2018-01-26 01:25:41 -08:00
Travis Rowland
90e411fec2 Merge branch 'master' into Theaxiom-patch-1 2017-11-23 15:13:09 -08:00
Travis Rowland
95d89dd251 Merge branch 'master' into Theaxiom-patch-2 2017-11-23 15:12:00 -08:00
Travis Rowland
06e2983ba9 Merge pull request #453 from sundbry/sigint-logging
Fork syslog-ng into a new process group via bash monitor mode
2017-11-23 15:11:35 -08:00
Travis Rowland
5ab2367f76 Merge branch 'master' into sigint-logging 2017-11-23 12:28:39 -08:00
Travis Rowland
61d585bce9 Merge pull request #447 from kamermans/bugfix/syslog_unclean_shutdown
Gracefully handle syslog-ng shutdown
2017-11-23 12:28:14 -08:00
Ryan Sundberg
b77633463f Fork syslog-ng into a new process group via bash monitor mode
This prevents SIGINT from a user interrupt from prematurely quitting syslog-ng.
See https://github.com/phusion/baseimage-docker/issues/450
2017-11-22 23:18:19 -08:00
Steve Kamerman
9bb3117b0c Merge branch 'master' into bugfix/syslog_unclean_shutdown 2017-11-03 17:14:19 -04:00
Travis Rowland
338238d685 Merge branch 'master' into Theaxiom-patch-2 2017-11-02 11:47:18 -07:00
Travis Rowland
c5680a44b1 Merge pull request #446 from phusion/add-code-of-conduct-1
Create CODE_OF_CONDUCT.md
2017-11-02 11:46:51 -07:00
Travis Rowland
4468bb296e Incrementing version AFFECTS #448 2017-11-02 09:34:12 -07:00
Steve Kamerman
25d13ef2b8 Gracefully handle syslog-ng shutdown 2017-11-01 17:26:31 -04:00
Travis Rowland
4cb596bfc9 Create CODE_OF_CONDUCT.md 2017-11-01 12:16:33 -07:00
Travis Rowland
42c48d8465 Merge pull request #425 from sundbry/syslog-shutdown
Start syslog-ng before runit, and stop after runit.
2017-11-01 12:06:35 -07:00
Ryan Sundberg
18a10580e1 Syslog-ng start and stop, preserving stdout file descriptor 2017-10-31 15:41:59 -07:00
Ryan Sundberg
d765626688 Prefix syslog-ng shutdown scripts with boot order 2017-10-31 14:24:18 -07:00
Ryan Sundberg
69d1b96431 Capitalization 2017-10-31 14:21:23 -07:00
Ryan Sundberg
89389d5086 Merge branch 'syslog-shutdown' of github.com:sundbry/baseimage-docker into syslog-shutdown 2017-10-31 14:16:47 -07:00
Ryan Sundberg
70b5c73902 System logging notes in README.md 2017-10-31 14:16:27 -07:00
Travis Rowland
7c7ab1a0a6 my_init exits with 0 on SIGINT after runit is started
fixes #358
2017-10-30 12:04:21 -07:00
Travis Rowland
b05616332a Merge branch 'master' into syslog-shutdown 2017-10-30 11:59:01 -07:00
Steve Kamerman
421ca4ea05 Renamed install_clean 2017-10-30 10:22:42 -04:00
Steve Kamerman
c41f837f82 Added --no-install-recommends by default 2017-10-30 10:22:42 -04:00
Steve Kamerman
fcc1283c85 Added install_clean.sh utility 2017-10-30 10:22:42 -04:00
Kingdon Barrett
ffc1f6db05 Merge pull request #444 from SConaway/patch-1
Update README.md
2017-10-25 12:57:17 -04:00
Steven Conaway
6a774f2f48 Update README.md 2017-10-23 18:53:46 -07:00
Travis Rowland
c7efb776b8 Merge pull request #439 from mortn/patch-1
Adding "more" to the first sentence.
2017-10-09 10:31:52 -07:00
Morten Abildgaard
2be1e6f407 Adding "more" to the first sentence.
I think this is what it's supposed to say.
2017-10-08 11:42:53 +02:00
David Hiendl
2bb9d89325 configured syslog-ng to log to stdout directly instead of using tail (#438) 2017-10-05 21:13:01 +02:00
Dotan J. Nahum
8d7f3abd2d Reflect 'latest' in imagelayers.io image. (#435) 2017-10-05 19:51:41 +02:00
Ryan Sundberg
91363dcf37 Merge branch 'master' of https://github.com/phusion/baseimage-docker into syslog-shutdown 2017-09-28 11:26:45 -07:00
Zsolt Ero
0cf1fd05ac removed testing artifact 2017-08-17 00:04:42 +02:00
Zsolt Ero
544511f883 bad-tag test 2017-08-16 23:58:18 +02:00
Zsolt Ero
0ad69ad848 good-tag test 2017-08-16 23:57:12 +02:00
Zsolt Ero
39ad242428 yaml quotes fix 2017-08-16 23:51:24 +02:00
Zsolt Ero
a52c8d4ae0 test_release, test_master 2017-08-16 23:41:17 +02:00
Kingdon Barrett
1bd5b85eb1 Merge pull request #432 from phusion/patch-1
Replaces #410
2017-08-08 13:34:30 -04:00
Travis Rowland
1a235a13e1 Update my_init 2017-07-31 21:49:57 -04:00
Jose Diaz-Gonzalez
0e15f28fb7 feat: allow users to specify an alternative init directory
In some existing environments, packages might already use another environment for the purpose this `/etc/my_init.d` directory serves.
2017-07-31 21:49:57 -04:00
Zsolt Ero
d6702be8c3 fix_pam_bug removed (#431) 2017-08-01 01:35:38 +02:00
Przemysław Dąbek
40bad74956 sanitize_shenvname returns string with [0-9a-zA-Z_] characters (#423)
* sanitize_shenvname returns string with [0-9a-zA-Z_] characters

* moved regex pattern to constant
2017-07-31 15:38:33 +02:00
Ryan Sundberg
a6bf447f9e Start syslog-ng before runit, and stop after runit.
When syslog-ng is managed as an runit service, application logs may be
lost during shutdown, when the syslog-ng service stops before the app
exits.

This change uses the my_init.d directory to manage syslog-ng at a lower
runlevel than runit.
2017-07-01 15:08:08 -07:00
Travis Rowland
b57f08c71f Merge pull request #409 from goneio/refactor/remove-unnecessary-env-layers
Remove 3 unnecessary layers from the layer count.
2017-05-23 14:15:51 -07:00
Matthew Baggett
a3faefd3d3 Remove 3 unnecessary layers from the layer count. 2017-05-18 13:59:29 +01:00
17 changed files with 218 additions and 109 deletions

View File

@@ -2,6 +2,21 @@ sudo: required
services:
- docker
env:
global:
- NAME=phusion/baseimage
# - VERSION=${TRAVIS_TAG}
- VERSION=${TRAVIS_BRANCH}
script:
- make build
- docker build -t ${NAME}:${VERSION} --rm image
- env NAME=${NAME} VERSION=${VERSION} ./test/runner.sh
after_success:
- docker login -u "${DOCKER_USERNAME}" -p "${DOCKER_PASSWORD}";
docker push ${NAME}:${VERSION};
# - if [ "${TRAVIS_BRANCH}" == "master" ]; then
# docker tag ${NAME}:${VERSION} ${NAME}:latest
# docker push ${NAME}:latest;
# fi

52
CODE_OF_CONDUCT.md Normal file
View File

@@ -0,0 +1,52 @@
# Contributor Covenant Code of Conduct
## Our Pledge
In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation.
## Our Standards
Examples of behavior that contributes to creating a positive environment include:
* Using welcoming and inclusive language
* Being respectful of differing viewpoints and experiences
* Gracefully accepting constructive criticism
* Focusing on what is best for the community
* Showing empathy towards other community members
Examples of unacceptable behavior by participants include:
* The use of sexualized language or imagery and unwelcome sexual attention or advances
* Trolling, insulting/derogatory comments, and personal or political attacks
* Public or private harassment
* Publishing others' private information, such as a physical or electronic address, without explicit permission
* Other conduct which could reasonably be considered inappropriate in a professional setting
## Our Responsibilities
Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior.
Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.
## Scope
This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers.
## Enforcement
Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at Phusion Passenger:
[FloorD](https://github.com/floord) (she/her), floor@phusion.nl, English / Dutch / German
[OnixGH](https://github.com/OnixGH) (he/his), daniel@phusion.nl, English / Dutch
The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.
## Attribution
This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version]
[homepage]: http://contributor-covenant.org
[version]: http://contributor-covenant.org/version/1/4/

View File

@@ -1,5 +1,5 @@
NAME = phusion/baseimage
VERSION = 0.9.22
VERSION = 0.10.2
.PHONY: all build test tag_latest release ssh
@@ -26,3 +26,11 @@ ssh:
IP=$$(docker inspect $$ID | grep IPAddr | sed 's/.*: "//; s/".*//') && \
echo "SSHing into $$IP" && \
ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i image/services/sshd/keys/insecure_key root@$$IP
test_release:
echo test_release
env
test_master:
echo test_master
env

View File

@@ -1,9 +1,9 @@
# A minimal Ubuntu base image modified for Docker-friendliness
[![](https://badge.imagelayers.io/phusion/baseimage:0.9.17.svg)](https://imagelayers.io/?images=phusion/baseimage:latest 'Get your own badge on imagelayers.io')
[![](https://badge.imagelayers.io/phusion/baseimage:latest.svg)](https://imagelayers.io/?images=phusion/baseimage:latest 'Get your own badge on imagelayers.io')
[![Travis](https://img.shields.io/travis/phusion/baseimage-docker.svg)](https://travis-ci.org/phusion/baseimage-docker)
_Baseimage-docker only consumes 6 MB RAM and is much powerful than Busybox or Alpine. See why below._
_Baseimage-docker only consumes 8.3 MB RAM and is much more powerful than Busybox or Alpine. See why below._
Baseimage-docker is a special [Docker](https://www.docker.com) image that is configured for correct use within Docker containers. It is Ubuntu, plus:
@@ -57,6 +57,7 @@ You can configure the stock `ubuntu` image yourself from your Dockerfile, so why
* [Environment variable dumps](#envvar_dumps)
* [Modifying environment variables](#modifying_envvars)
* [Security](#envvar_security)
* [System logging](#logging)
* [Upgrading the operating system inside the container](#upgrading_os)
* [Container administration](#container_administration)
* [Running a one-shot command in a new container](#oneshot)
@@ -95,8 +96,9 @@ You can configure the stock `ubuntu` image yourself from your Dockerfile, so why
| cron | The cron daemon must be running for cron jobs to work. |
| [runit](http://smarden.org/runit/) | Replaces Ubuntu's Upstart. Used for service supervision and management. Much easier to use than SysV init and supports restarting daemons when they crash. Much easier to use and more lightweight than Upstart. |
| `setuser` | A tool for running a command as another user. Easier to use than `su`, has a smaller attack vector than `sudo`, and unlike `chpst` this tool sets `$HOME` correctly. Available as `/sbin/setuser`. |
| `install_clean` | A tool for installing `apt` packages that automatically cleans up after itself. All arguments are passed to `apt-get -y install --no-install-recommends` and after installation the apt caches are cleared. To include recommended packages, add `--install-recommends`. |
Baseimage-docker is very lightweight: it only consumes 6 MB of memory.
Baseimage-docker is very lightweight: it only consumes 8.3 MB of memory.
<a name="docker_single_process"></a>
### Wait, I thought Docker is about running a single process in a container?
@@ -198,7 +200,7 @@ In `Dockerfile`:
RUN mkdir -p /etc/my_init.d
COPY logtime.sh /etc/my_init.d/logtime.sh
RUN chmod +x /etc/my_init.d/logtime.sh
RUN chmod +x /etc/my_init.d/logtime.sh
<a name="environment_variables"></a>
@@ -302,6 +304,14 @@ If you are sure that your environment variables don't contain sensitive data, th
RUN chmod 755 /etc/container_environment
RUN chmod 644 /etc/container_environment.sh /etc/container_environment.json
<a name="logging"></a>
### System logging
Baseimage-docker uses syslog-ng to provide a syslog facility to the container. Syslog-ng is not managed as an runit service (see below). Syslog messages are forwarded to the console.
#### Log startup/shutdown sequence
In order to ensure that all application log messages are captured by syslog-ng, syslog-ng is started separately before the runit supervisor process, and shutdown after runit exits. This uses the [startup script facility](#running_startup_scripts) provided by this image. This avoids a race condition which would exist if syslog-ng were managed as an runit service, where runit kills syslog-ng in parallel with the container's other services, causing log messages to be dropped during a graceful shutdown if syslog-ng exits while logs are still being produced by other services.
<a name="upgrading_os"></a>
### Upgrading the operating system inside the container
@@ -440,7 +450,7 @@ Then, you can start your container with
docker run -d -v `pwd`/myfolder:/etc/my_init.d my/dockerimage
This will initialize sshd on container boot. You can then access it with the insecure key as below, or using the methods to add a secure key. Further, you can publish the port to your machine with -p 22:2222 allowing you to ssh to localhost:2222 instead of looking up the ip address.
This will initialize sshd on container boot. You can then access it with the insecure key as below, or using the methods to add a secure key. Further, you can publish the port to your machine with -p 2222:22 allowing you to ssh to 127.0.0.1:2222 instead of looking up the ip address of the container.
<a name="ssh_keys"></a>
#### About SSH keys
@@ -485,7 +495,7 @@ Edit your Dockerfile to install the insecure key permanently:
RUN /usr/sbin/enable_insecure_key
Instructions for logging in the container is the same as in section [Using the insecure key for one container only](#using_the_insecure_key_for_one_container_only).
Instructions for logging into the container is the same as in section [Using the insecure key for one container only](#using_the_insecure_key_for_one_container_only).
<a name="using_your_own_key"></a>
#### Using your own key

View File

@@ -6,13 +6,11 @@ COPY . /bd_build
RUN /bd_build/prepare.sh && \
/bd_build/system_services.sh && \
/bd_build/utilities.sh && \
/bd_build/fix_pam_bug.sh && \
/bd_build/cleanup.sh
ENV DEBIAN_FRONTEND teletype
ENV LANG en_US.UTF-8
ENV LANGUAGE en_US:en
ENV LC_ALL en_US.UTF-8
ENV DEBIAN_FRONTEND="teletype" \
LANG="en_US.UTF-8" \
LANGUAGE="en_US:en" \
LC_ALL="en_US.UTF-8"
CMD ["/sbin/my_init"]

17
image/bin/install_clean Executable file
View File

@@ -0,0 +1,17 @@
#!/bin/bash -e
# Apt installer helper for Docker images
ARGS="$*"
NO_RECOMMENDS="--no-install-recommends"
RECOMMENDS="--install-recommends"
if [[ $ARGS =~ "$RECOMMENDS" ]]; then
NO_RECOMMENDS=""
ARGS=$(sed "s/$RECOMMENDS//g" <<<"$ARGS")
fi
echo "Installing $ARGS"
apt-get -q update && apt-get -qy install $NO_RECOMMENDS $ARGS \
&& apt-get -qy autoremove \
&& apt-get clean \
&& rm -r /var/lib/apt/lists/*

View File

@@ -12,6 +12,8 @@ import stat
import sys
import time
ENV_INIT_DIRECTORY = os.environ.get('ENV_INIT_DIRECTORY', '/etc/my_init.d')
KILL_PROCESS_TIMEOUT = int(os.environ.get('KILL_PROCESS_TIMEOUT', 5))
KILL_ALL_PROCESSES_TIMEOUT = int(os.environ.get('KILL_ALL_PROCESSES_TIMEOUT', 5))
@@ -20,7 +22,7 @@ LOG_LEVEL_WARN = 1
LOG_LEVEL_INFO = 2
LOG_LEVEL_DEBUG = 3
SHENV_NAME_WHITELIST_REGEX = re.compile('[^\w\-_\.]')
SHENV_NAME_WHITELIST_REGEX = re.compile('\W')
log_level = None
@@ -130,6 +132,7 @@ def shquote(s):
def sanitize_shenvname(s):
"""Return string with [0-9a-zA-Z_] characters"""
return re.sub(SHENV_NAME_WHITELIST_REGEX, "_", s)
@@ -249,9 +252,9 @@ def kill_all_processes(time_limit):
def run_startup_files():
# Run /etc/my_init.d/*
for name in listdir("/etc/my_init.d"):
filename = "/etc/my_init.d/" + name
# Run ENV_INIT_DIRECTORY/*
for name in listdir(ENV_INIT_DIRECTORY):
filename = os.path.join(ENV_INIT_DIRECTORY, name)
if is_exe(filename):
info("Running %s..." % filename)
run_command_killable_and_import_envvars(filename)
@@ -293,11 +296,8 @@ def start_runit():
def wait_for_runit_or_interrupt(pid):
try:
status = waitpid_reap_other_children(pid)
return (True, status)
except KeyboardInterrupt:
return (False, None)
status = waitpid_reap_other_children(pid)
return (True, status)
def shutdown_runit_services(quiet=False):

View File

@@ -1,33 +0,0 @@
#!/bin/bash
set -e
source /bd_build/buildconfig
set -x
# Fixes https://github.com/docker/docker/issues/6345
# The Github is closed, but some apps such as pbuilder still triggers it.
export CONFIGURE_OPTS=--disable-audit
cd /tmp
$minimal_apt_get_install gdebi-core
apt-get build-dep -y --no-install-recommends pam
apt-get source -y -b pam
gdebi -n libpam-doc*.deb libpam-modules*.deb libpam-runtime*.deb libpam0g*.deb
rm -rf *.deb *.gz *.dsc *.changes pam-*
# Unfortunately there is no way to automatically remove build deps, so we do this manually.
apt-get remove -y gdebi-core autoconf automake autopoint autotools-dev binutils bsdmainutils \
build-essential bzip2 cpp cpp-5 debhelper dh-autoreconf dh-strip-nondeterminism \
diffstat docbook-xml docbook-xsl dpkg-dev flex g++ g++-5 gcc gcc-5 gettext gettext-base \
groff-base intltool-debian libarchive-zip-perl libasan2 libasprintf0v5 libatomic1 \
libaudit-dev libc-dev-bin libc6-dev libcc1-0 libcilkrts5 libcrack2 libcrack2-dev libcroco3 \
libdb-dev libdb5.3-dev libdpkg-perl libfile-stripnondeterminism-perl libfl-dev libgc1c2 \
libgcc-5-dev libgdbm3 libgomp1 libgpm2 libicu55 libisl15 libitm1 liblsan0 libmpc3 \
libmpfr4 libmpx0 libpcre16-3 libpcre3-dev libpcre32-3 libpcrecpp0v5 libperl5.22 \
libpipeline1 libquadmath0 libselinux1-dev libsepol1-dev libsigsegv2 libstdc++-5-dev \
libtimedate-perl libtool libtsan0 libubsan0 libunistring0 libxml2 libxml2-utils \
libxslt1.1 linux-libc-dev m4 make man-db patch perl perl-modules-5.22 pkg-config \
po-debconf quilt sgml-base sgml-data w3m xml-core xsltproc xz-utils
apt-get remove -y gdebi-core
apt-get autoremove -y

View File

@@ -7,8 +7,9 @@
delaycompress
compress
postrotate
sv reload syslog-ng > /dev/null
sv restart syslog-forwarder > /dev/null
if [ -f /var/run/syslog-ng.pid ]; then
kill -HUP `cat /var/run/syslog-ng.pid`
fi
endscript
}
@@ -33,7 +34,8 @@
delaycompress
sharedscripts
postrotate
sv reload syslog-ng > /dev/null
sv restart syslog-forwarder > /dev/null
if [ -f /var/run/syslog-ng.pid ]; then
kill -HUP `cat /var/run/syslog-ng.pid`
fi
endscript
}

View File

@@ -1,2 +0,0 @@
#!/bin/sh
exec tail -F -n 0 /var/log/syslog

View File

@@ -54,7 +54,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"); };
@@ -74,6 +74,9 @@ destination d_xconsole { pipe("/dev/xconsole"); };
# Debian only
destination d_ppp { file("/var/log/ppp.log"); };
# stdout for docker
destination d_stdout { ##SYSLOG_OUTPUT_MODE_DEV_STDOUT##("/dev/stdout"); };
########################
# Filters
########################
@@ -119,7 +122,7 @@ log { source(s_src); filter(f_cron); destination(d_cron); };
log { source(s_src); filter(f_daemon); destination(d_daemon); };
log { source(s_src); filter(f_kern); destination(d_kern); };
log { source(s_src); filter(f_lpr); destination(d_lpr); };
log { source(s_src); filter(f_syslog3); destination(d_syslog); };
log { source(s_src); filter(f_syslog3); destination(d_syslog); destination(d_stdout); };
log { source(s_src); filter(f_user); destination(d_user); };
log { source(s_src); filter(f_uucp); destination(d_uucp); };

View File

@@ -0,0 +1,45 @@
#!/bin/bash
set -em
# If /dev/log is either a named pipe or it was placed there accidentally,
# e.g. because of the issue documented at https://github.com/phusion/baseimage-docker/pull/25,
# then we remove it.
if [ ! -S /dev/log ]; then rm -f /dev/log; fi
if [ ! -S /var/lib/syslog-ng/syslog-ng.ctl ]; then rm -f /var/lib/syslog-ng/syslog-ng.ctl; fi
# determine output mode on /dev/stdout because of the issue documented at https://github.com/phusion/baseimage-docker/issues/468
if [ -p /dev/stdout ]; then
sed -i 's/##SYSLOG_OUTPUT_MODE_DEV_STDOUT##/pipe/' /etc/syslog-ng/syslog-ng.conf
else
sed -i 's/##SYSLOG_OUTPUT_MODE_DEV_STDOUT##/file/' /etc/syslog-ng/syslog-ng.conf
fi
# If /var/log is writable by another user logrotate will fail
/bin/chown root:root /var/log
/bin/chmod 0755 /var/log
PIDFILE="/var/run/syslog-ng.pid"
SYSLOGNG_OPTS=""
[ -r /etc/default/syslog-ng ] && . /etc/default/syslog-ng
syslogng_wait() {
if [ "$2" -ne 0 ]; then
return 1
fi
RET=1
for i in $(seq 1 30); do
status=0
syslog-ng-ctl stats >/dev/null 2>&1 || status=$?
if [ "$status" != "$1" ]; then
RET=0
break
fi
sleep 1s
done
return $RET
}
/usr/sbin/syslog-ng --pidfile "$PIDFILE" -F $SYSLOGNG_OPTS &
syslogng_wait 1 $?

View File

@@ -1,32 +0,0 @@
#!/bin/sh
set -e
# If /dev/log is either a named pipe or it was placed there accidentally,
# e.g. because of the issue documented at https://github.com/phusion/baseimage-docker/pull/25,
# then we remove it.
if [ ! -S /dev/log ]; then rm -f /dev/log; fi
if [ ! -S /var/lib/syslog-ng/syslog-ng.ctl ]; then rm -f /var/lib/syslog-ng/syslog-ng.ctl; fi
SYSLOGNG_OPTS=""
[ -r /etc/default/syslog-ng ] && . /etc/default/syslog-ng
case "x$CONSOLE_LOG_LEVEL" in
x[1-8])
dmesg -n $CONSOLE_LOG_LEVEL
;;
x)
;;
*)
echo "CONSOLE_LOG_LEVEL is of unaccepted value."
;;
esac
if [ ! -e /dev/xconsole ]
then
mknod -m 640 /dev/xconsole p
chown root:adm /dev/xconsole
[ -x /sbin/restorecon ] && /sbin/restorecon $XCONSOLE
fi
exec syslog-ng -F -p /var/run/syslog-ng.pid $SYSLOGNG_OPTS

View File

@@ -7,18 +7,14 @@ SYSLOG_NG_BUILD_PATH=/bd_build/services/syslog-ng
## Install a syslog daemon.
$minimal_apt_get_install syslog-ng-core
mkdir /etc/service/syslog-ng
cp $SYSLOG_NG_BUILD_PATH/syslog-ng.runit /etc/service/syslog-ng/run
cp $SYSLOG_NG_BUILD_PATH/syslog-ng.init /etc/my_init.d/10_syslog-ng.init
cp $SYSLOG_NG_BUILD_PATH/syslog-ng.shutdown /etc/my_init.post_shutdown.d/10_syslog-ng.shutdown
mkdir -p /var/lib/syslog-ng
cp $SYSLOG_NG_BUILD_PATH/syslog_ng_default /etc/default/syslog-ng
touch /var/log/syslog
chmod u=rw,g=r,o= /var/log/syslog
cp $SYSLOG_NG_BUILD_PATH/syslog-ng.conf /etc/syslog-ng/syslog-ng.conf
## Install syslog to "docker logs" forwarder.
mkdir /etc/service/syslog-forwarder
cp $SYSLOG_NG_BUILD_PATH/syslog-forwarder.runit /etc/service/syslog-forwarder/run
## Install logrotate.
$minimal_apt_get_install logrotate
cp $SYSLOG_NG_BUILD_PATH/logrotate.conf /etc/logrotate.conf

View File

@@ -0,0 +1,27 @@
#!/bin/bash
PIDFILE="/var/run/syslog-ng.pid"
syslogng_wait() {
if [ "$2" -ne 0 ]; then
return 1
fi
RET=1
for i in $(seq 1 30); do
status=0
syslog-ng-ctl stats >/dev/null 2>&1 || status=$?
if [ "$status" != "$1" ]; then
RET=0
break
fi
sleep 1s
done
return $RET
}
if [ -f "$PIDFILE" ]; then
kill $(cat "$PIDFILE")
fi
syslogng_wait 0 $?

View File

@@ -9,3 +9,6 @@ ln -s /usr/bin/vim.tiny /usr/bin/vim
## This tool runs a command as another user and sets $HOME.
cp /bd_build/bin/setuser /sbin/setuser
## This tool allows installation of apt packages with automatic cache cleanup.
cp /bd_build/bin/install_clean /sbin/install_clean

View File

@@ -17,13 +17,13 @@ function cleanup()
PWD=`pwd`
echo " --> Starting insecure container"
ID=`docker run -d -v $PWD/test:/test $NAME:$VERSION /sbin/my_init --enable-insecure-key`
ID=`docker run -d -p 22 -v $PWD/test:/test $NAME:$VERSION /sbin/my_init --enable-insecure-key`
sleep 1
echo " --> Obtaining IP"
IP=`docker inspect -f "{{ .NetworkSettings.IPAddress }}" "$ID"`
if [[ "$IP" = "" ]]; then
abort "Unable to obtain container IP"
echo " --> Obtaining SSH port number"
SSHPORT=`docker inspect --format='{{(index (index .NetworkSettings.Ports "22/tcp") 0).HostPort}}' "$ID"`
if [[ "$SSHPORT" = "" ]]; then
abort "Unable to obtain container SSH port number"
fi
trap cleanup EXIT
@@ -38,5 +38,5 @@ echo " --> Logging into container and running tests"
cp image/services/sshd/keys/insecure_key /tmp/insecure_key
chmod 600 /tmp/insecure_key
sleep 1 # Give container some more time to start up.
ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i /tmp/insecure_key root@$IP \
ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i /tmp/insecure_key -p $SSHPORT root@127.0.0.1 \
/bin/bash /test/test.sh