From c40591ee2c6ffda66b55f441a7b374af03d3b1e1 Mon Sep 17 00:00:00 2001 From: Zsolt Ero Date: Sat, 17 Feb 2018 02:03:32 +0100 Subject: [PATCH 1/3] removed syslog-forwarder from readme --- README.md | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index b9f28c1..1afc97a 100644 --- a/README.md +++ b/README.md @@ -144,12 +144,12 @@ The image is called `phusion/baseimage`, and is available on the Docker registry # See https://github.com/phusion/baseimage-docker/blob/master/Changelog.md for # a list of version numbers. FROM phusion/baseimage: - + # Use baseimage-docker's init system. CMD ["/sbin/my_init"] - + # ...put your own build instructions here... - + # Clean up APT when done. RUN apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* @@ -200,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 @@ -307,7 +307,7 @@ If you are sure that your environment variables don't contain sensitive data, th ### 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 via the service at /etc/service/syslog-forwarder. +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. @@ -479,10 +479,10 @@ Now that you have the IP address, you can use SSH to login to the container, or # Download the insecure private key curl -o insecure_key -fSL https://github.com/phusion/baseimage-docker/raw/master/image/services/sshd/keys/insecure_key chmod 600 insecure_key - + # Login to the container ssh -i insecure_key root@ - + # Running a command inside the container ssh -i insecure_key root@ echo hello world @@ -522,7 +522,7 @@ Now that you have the IP address, you can use SSH to login to the container, or # Login to the container ssh -i /path-to/your_key root@ - + # Running a command inside the container ssh -i /path-to/your_key root@ echo hello world From c5b6ed442d7a7905772b89c6cb191b7b7e914541 Mon Sep 17 00:00:00 2001 From: Zsolt Ero Date: Sat, 17 Feb 2018 02:05:21 +0100 Subject: [PATCH 2/3] readme fix --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 1afc97a..21c0ec0 100644 --- a/README.md +++ b/README.md @@ -200,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 From 9d63ae751cd28363af59d761a244f5f915e98920 Mon Sep 17 00:00:00 2001 From: Zsolt Ero Date: Sat, 17 Feb 2018 02:28:14 +0100 Subject: [PATCH 3/3] RAM usage updated in readme --- README.md | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 21c0ec0..4980041 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ [![](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 more 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: @@ -98,7 +98,7 @@ You can configure the stock `ubuntu` image yourself from your Dockerfile, so why | `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. ### Wait, I thought Docker is about running a single process in a container? @@ -144,12 +144,12 @@ The image is called `phusion/baseimage`, and is available on the Docker registry # See https://github.com/phusion/baseimage-docker/blob/master/Changelog.md for # a list of version numbers. FROM phusion/baseimage: - + # Use baseimage-docker's init system. CMD ["/sbin/my_init"] - + # ...put your own build instructions here... - + # Clean up APT when done. RUN apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* @@ -479,10 +479,10 @@ Now that you have the IP address, you can use SSH to login to the container, or # Download the insecure private key curl -o insecure_key -fSL https://github.com/phusion/baseimage-docker/raw/master/image/services/sshd/keys/insecure_key chmod 600 insecure_key - + # Login to the container ssh -i insecure_key root@ - + # Running a command inside the container ssh -i insecure_key root@ echo hello world @@ -522,7 +522,7 @@ Now that you have the IP address, you can use SSH to login to the container, or # Login to the container ssh -i /path-to/your_key root@ - + # Running a command inside the container ssh -i /path-to/your_key root@ echo hello world