French locales

Further improvements to the multi-arch build

.circleci/config.yml

@@ -0,0 +1,21 @@
+version: 2
+jobs:
+  build:
+    machine: true
+    steps:
+      - checkout
+      #- run:
+      #    name : Getting docker
+      #    command: curl https://get.docker.com | sh
+      - run:
+          name: Enabling qemu
+          command: docker run --rm --privileged multiarch/qemu-user-static:register --reset
+      - run:
+          name: Building arm based image.
+          command: docker build -t arm-test .
+      - run:
+          name: Listing built images
+          command: docker images
+      # - run:
+      #     name: Running arm based image.
+      #     command: docker run --rm arm-test 

.editorconfig

@@ -0,0 +1,11 @@
+# EditorConfig is awesome: http://EditorConfig.org
+
+# top-most EditorConfig file
+root = true
+
+# Unix-style newlines with a newline ending every file
+[*]
+end_of_line = lf
+insert_final_newline = true
+indent_size = 4
+indent_style = tab

.gitignore

@@ -1,2 +1,3 @@
 .DS_Store
 .vagrant
+*.swp

.travis.yml

@@ -0,0 +1,51 @@
+sudo: required
+
+language: c
+
+services:
+  - docker
+
+addons:
+  apt:
+    packages:
+      - docker-ce
+      - qemu-user-static
+
+env:
+  global:
+    # - VERSION=${TRAVIS_TAG}
+    - VERSION=${TRAVIS_BRANCH}
+    - DOCKER_CLI_EXPERIMENTAL=enabled
+    - QEMU_VERSION=v4.0.0
+
+  matrix:
+    # PLATFORM = Base image architecture to be used
+    # QEMU_ARCH = qemu binary to be downloaded from https://github.com/multiarch/qemu-user-static/releases
+    # TAG_ARCH = Tag to be applied to the image when upload to DockerHub
+    - PLATFORM=amd64 QEMU_ARCH=amd64   TAG_ARCH=amd64
+    - PLATFORM=arm64 QEMU_ARCH=aarch64 TAG_ARCH=arm64
+    - PLATFORM=arm   QEMU_ARCH=arm     TAG_ARCH=arm
+
+stage: Compile
+
+before_script:
+  - echo '{"experimental":true}' | sudo tee /etc/docker/daemon.json
+  - sudo service docker restart
+
+script:
+  - docker login -u "${DOCKER_USERNAME}" -p "${DOCKER_PASSWORD}";
+  - make build test
+
+  - if [[ $TRAVIS_PULL_REQUEST == 'false' ]]; then
+    make release;
+    fi
+
+jobs:
+  include:
+    - stage: deploy
+      env:
+        - ARCHS="amd64 arm64 arm"
+      script:
+        - echo $NAME:$VERSION_TAG
+        - echo "$DOCKER_PASSWORD" | docker login --username "$DOCKER_USERNAME" --password-stdin
+        - make build_multiarch

CODE_OF_CONDUCT.md

@@ -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
+
+[Scarhand](https://github.com/scarhand) (he/his), niels@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/

Changelog.md

@@ -1,123 +1 @@
-## 0.9.16 (release date: 2015-01-20)
-
- * `docker exec` is now the default and recommended mechanism for running commands in the container. SSH is now disabled by default, but is still supported for those cases where "docker exec" is not appropriate. Closes GH-168.
- * All syslog output is now forwarded to `docker logs`. Closes GH-123.
- * The workaround for Docker bug 2267 (the inability to modify /etc/hosts) has been removed, because it has been fixed upstream. Closes GH-155.
- * Logrotate now reloads syslog-ng properly. Closes GH-167.
- * Fixed some locale issues. Closes GH-178. Thanks to David J. M. Karlsen.
- * Fixed problems with cron. Closes GH-115.
- * Contribution by Bryan Bishop.
-
-## 0.9.15 (release date: 2014-10-03)
-
- * Fixed the setuid bit on /usr/bin/sudo. This problem was caused by Docker bug #6828.
-
-## 0.9.14 (release date: 2014-10-01)
-
- * Installed all the latest Ubuntu security updates. This patches Shellshock, among other things.
- * Some documentation updates by andreamtp.
-
-## 0.9.13 (release date: 2014-08-22)
-
- * Fixed `my_init` not properly exiting with a non-zero exit status when Ctrl-C is pressed.
- * The GID of the `docker_env` group has been changed from 1000 to 8377, in order to avoid GID conflicts with any groups that you might want to introduce inside the container.
- * The syslog-ng socket is now deleted before starting the syslog-ng daemon, to avoid the daemon from failing to start due to garbage on the filesystem. Thanks to Kingdon Barrett. Closes GH-129.
- * Typo fixes by Arkadi Shishlov.
-
-## 0.9.12 (release date: 2014-07-24)
-
- * We now officially support `nsenter` as an alternative way to login to the container. With official support, we mean that we've provided extensive documentation on how to use `nsenter`, as well as related convenience tools. However, because `nsenter` has various issues, and for backward compatibility reasons, we still support SSH. Please refer to the README for details about `nsenter`, and what the pros and cons are compared to SSH.
-   * The `docker-bash` tool has been modified to use `nsenter` instead of SSH.
-   * What was previously the `docker-bash` tool, has now been renamed to `docker-ssh`. It now also works on a regular sh shell too, instead of bash specifically.
- * Added a workaround for Docker's inability to modify /etc/hosts in the container ([Docker bug 2267](https://github.com/dotcloud/docker/issues/2267)). Please refer to the README for details.
- * Fixed an issue with SSH X11 forwarding. Thanks to Anatoly Bubenkov. Closes GH-105.
- * The init system now prints its own log messages to stderr. Thanks to mephi42. Closes GH-106.
-
-## 0.9.11 (release date: 2014-06-24)
-
- * Introduced the `docker-bash` tool. This is a shortcut tool for logging into a container using SSH. Usage: `docker-bash <CONTAINER ID>`. See the README for details.
- * Fixed various process waiting issues in `my_init`. Closes GH-27, GH-82 and GH-83. Thanks to André Luiz dos Santos and Paul Annesley.
- * The `ca-certificates` package is now installed by default. This is because we include `apt-transport-https`, but Ubuntu 14.04 no longer installs `ca-certificates` by default anymore. Closes GH-73.
- * Output print by Runit services are now redirected to the Docker logs instead of to proctitle. Thanks to Paul Annesley.
- * Container environment variables are now made available to SSH root shells. If you login with SSH through a non-root account, then container environment variables are only made available if that user is a member of the `docker_env` group. Thanks to Bernard Potocki.
- * `add-apt-repository` is now installed by default. Closes GH-74.
- * Various minor fixes and contributions thanks to yebyen, John Eckhart, Christoffer Sawicki and Brant Fitzsimmons.
-
-## 0.9.10 (release date: 2014-05-12)
-
- * Upgraded to Ubuntu 14.04 (Trusty). We will no longer release images based on 12.04.
-   Thanks to contributions by mpeterson, Paul Jimenez, Santiago M. Mola and Kingdon Barrett.
- * Fixed a problem with my_init not correctly passing child processes' exit status. Fixes GH-45.
- * When reading environment variables from /etc/container_environment, the trailing newline (if any) is ignored. This makes commands like this work, without unintentially adding a newline to the environment variable value:
-
-        echo my_value > /etc/container_environment/FOO
-
-   If you intended on adding a newline to the value, ensure you have *two* trailing newlines:
-
-        echo -e "my_value\n" > /etc/container_environment/FOO
- * It was not possible to use `docker run -e` to override environment variables defined in /etc/container_environment. This has been fixed (GH-52). Thanks to Stuart Campbell for reporting this bug.
-
-## 0.9.9 (release date: 2014-03-25)
-
- * Fixed a problem with rssh. (Slawomir Chodnicki)
- * The `INITRD` environment variable is now set in the container by default. This prevents updates to the `initramfs` from running grub or lilo.
- * The `ischroot` tool in Ubuntu has been modified to always return true. This prevents updates to the `initscripts` package from breaking /dev/shm.
- * Various minor bug fixes, improvements and typo corrections. (Felix Hummel, Laurent Sarrazin, Dung Quang, Amir Gur)
-
-## 0.9.8 (release date: 2014-02-26)
-
- * Fixed a regression in `my_init` which causes it to delete environment variables passed from Docker.
- * Fixed `my_init` not properly forcing Runit to shut down if Runit appears to refuse to respond to SIGTERM.
-
-## 0.9.7 (release date: 2014-02-25)
-
- * Improved and fixed bugs in `my_init` (Thomas LÉVEIL):
-   * It is now possible to enable the insecure key by passing `--enable-insecure-key` to `my_init`. This allows users to easily enable the insecure key for convenience reasons, without having the insecure key enabled permanently in the image.
-   * `my_init` now exports environment variables to the directory `/etc/container_environment` and to the files `/etc/container_environment.sh`, `/etc/container_environment.json`. This allows all applications to query what the original environment variables were. It is also possible to change the environment variables in `my_init` by modifying `/etc/container_environment`. More information can be found in the README, section "Environment variables".
-   * Fixed a bug that causes it not to print messages to stdout when there is no pseudo terminal. This is because Python buffers stdout by default.
-   * Fixed an incorrectly printed message.
- * The insecure key is now also available in PuTTY format. (Thomas LÉVEIL)
- * Fixed `enable_insecure_key` removing already installed SSH keys. (Thomas LÉVEIL)
- * The baseimage-docker image no longer EXPOSEs any ports by default. The EXPOSE entries were originally there to enable some default guest-to-host port forwarding entries, but in recent Docker versions they changed the meaning of EXPOSE, and now EXPOSE is used for linking containers. As such, we no longer have a reason to EXPOSE any ports by default. Fixes GH-15.
- * Fixed syslog-ng not being able to start because of a missing afsql module. Fixes the issue described in [pull request 7](https://github.com/phusion/baseimage-docker/pull/7).
- * Removed some default Ubuntu cron jobs which are not useful in Docker containers.
- * Added the logrotate service. Fixes GH-22.
- * Fixed some warnings in `/etc/my_init.d/00_regen_ssh_host_keys.sh`.
- * Fixed some typos in the documentation. (Dr Nic Williams, Tomer Cohen)
-
-## 0.9.6 (release date: 2014-02-17)
-
- * Fixed a bug in `my_init`: child processes that have been adopted during execution of init scripts are now properly reaped.
- * Much improved `my_init`:
-   * It is now possible to run and watch a custom command, possibly in addition to running runit. See "Running a one-shot command in the container" in the README.
-   * It is now possible to skip running startup files such as /etc/rc.local.
-   * Shutdown is now much faster. It previously took a few seconds, but it is now almost instantaneous.
-   * It ensures that all processes in the container are properly shut down with SIGTERM, even those that are not direct child processes of `my_init`.
- * `setuser` now also sets auxilliary groups, as well as more environment variables such as `USER` and `UID`.
-
-## 0.9.5 (release date: 2014-02-06)
-
- * Environment variables are now no longer reset by runit. This is achieved by running `runsvdir` directly instead of through Debian's `runsvdir-start`.
- * The insecure SSH key is now disabled by default. You have to explicitly opt-in to use it.
-
-## 0.9.4 (release date: 2014-02-03)
-
- * Fixed syslog-ng startup problem.
-
-## 0.9.3 (release date: 2014-01-31)
-
- * It looks like Docker changed their Ubuntu 12.04 base image, thereby breaking our Dockerfile. This has been fixed.
- * The init system (`/sbin/my_init`) now supports running scripts during startup. You can put startup scripts `/etc/my_init.d`. `/etc/rc.local` is also run during startup.
- * To improve security, the base image no longer contains pregenerated SSH host keys. Instead, users of the base image are encouraged to regenerate one in their Dockerfile. If the user does not do that, then random SSH host keys are generated during container boot.
-
-## 0.9.2 (release date: 2013-12-11)
-
- * Fixed SFTP support. Thanks Joris van de Donk!
-
-## 0.9.1 (release date: 2013-11-12)
-
- * Improved init process script (`/sbin/my_init`): it now handles shutdown correctly. Previously, `docker stop` would not have any effect on `my_init`, causing the whole container to be killed with SIGKILL. The new init process script gracefully shuts down all runit services, then exits.
-
-## 0.9.0 (release date: 2013-11-12)
-
- * Initial release
+For the Changelog, please see [Releases](https://github.com/phusion/baseimage-docker/releases) on GitHub

LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2013-2014 Phusion
+Copyright (c) 2013-2015 Phusion Holding B.V.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

Makefile

@@ -1,29 +1,58 @@
-NAME = phusion/baseimage
-VERSION = 0.9.16
+VERSION ?= 0.11
+ifdef BASE_IMAGE
+	BUILD_ARG = --build-arg BASE_IMAGE=$(BASE_IMAGE)
+	ifndef NAME
+		NAME = phusion/baseimage-$(subst :,-,${BASE_IMAGE})
+	endif
+else
+	NAME ?= phusion/baseimage
+endif
+ifdef TAG_ARCH
+	# VERSION_ARG = $(VERSION)-$(subst /,-,$(subst :,-,${BASE_IMAGE}))-$(TAG_ARCH)
+	VERSION_ARG = $(VERSION)-$(TAG_ARCH)
+	LATEST_VERSION = latest-$(TAG_ARCH)
+else
+	# VERSION_ARG = $(VERSION)-$(subst /,-,$(subst :,-,${BASE_IMAGE}))
+	VERSION_ARG = $(VERSION)
+	LATEST_VERSION = latest
+endif
+VERSION_ARG ?= $(VERSION)
 
 .PHONY: all build test tag_latest release ssh
 
 all: build
 
 build:
-	docker build -t $(NAME):$(VERSION) --rm image
+	./build.sh
+	docker build --no-cache -t $(NAME):$(VERSION_ARG) $(BUILD_ARG) --build-arg QEMU_ARCH=$(QEMU_ARCH) --platform $(PLATFORM) --rm image
+
+build_multiarch:
+	env NAME=$(NAME) VERSION=$(VERSION_ARG) ./build-multiarch.sh
 
 test:
-	env NAME=$(NAME) VERSION=$(VERSION) ./test/runner.sh
+	env NAME=$(NAME) VERSION=$(VERSION_ARG) ./test/runner.sh
 
 tag_latest:
-	docker tag -f $(NAME):$(VERSION) $(NAME):latest
+	docker tag $(NAME):$(VERSION_ARG) $(NAME):$(LATEST_VERSION)
 
-release: test tag_latest
-	@if ! docker images $(NAME) | awk '{ print $$2 }' | grep -q -F $(VERSION); then echo "$(NAME) version $(VERSION) is not yet built. Please run 'make build'"; false; fi
-	@if ! head -n 1 Changelog.md | grep -q 'release date'; then echo 'Please note the release date in Changelog.md.' && false; fi
+tag_multiarch_latest:
+	env NAME=$(NAME) VERSION=$(VERSION) TAG_LATEST=true ./build-multiarch.sh
+
+release: test
+	@if ! docker images $(NAME) | awk '{ print $$2 }' | grep -q -F $(VERSION_ARG); then echo "$(NAME) version $(VERSION_ARG) is not yet built. Please run 'make build'"; false; fi
 	docker push $(NAME)
-	@echo "*** Don't forget to create a tag. git tag rel-$(VERSION) && git push origin rel-$(VERSION)"
+	@echo "*** Don't forget to create a tag by creating an official GitHub release."
 
+ssh: SSH_COMMAND?=
 ssh:
-	chmod 600 image/insecure_key
-	@ID=$$(docker ps | grep -F "$(NAME):$(VERSION)" | awk '{ print $$1 }') && \
+	ID=$$(docker ps | grep -F "$(NAME):$(VERSION_ARG)" | awk '{ print $$1 }') && \
 		if test "$$ID" = ""; then echo "Container is not running."; exit 1; fi && \
-		IP=$$(docker inspect $$ID | grep IPAddr | sed 's/.*: "//; s/".*//') && \
-		echo "SSHing into $$IP" && \
-		ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i image/insecure_key root@$$IP
+		tools/docker-ssh $$ID ${SSH_COMMAND}
+
+test_release:
+	echo test_release
+	env
+
+test_master:
+	echo test_master
+	env

README.md

@@ -1,5 +1,10 @@
 # A minimal Ubuntu base image modified for Docker-friendliness
 
+[![](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 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:
 
  * Modifications for Docker-friendliness.
@@ -12,7 +17,7 @@ Baseimage-docker is available for pulling from [the Docker registry](https://reg
 
 ### What are the problems with the stock Ubuntu base image?
 
-Ubuntu is not designed to be run inside Docker. Its init system, Upstart, assumes that it's running on either real hardware or virtualized hardware, but not inside a Docker container. But inside a container you don't want a full system anyway, you want a minimal system. But configuring that minimal system for use within a container has many strange corner cases that are hard to get right if you are not intimately familiar with the Unix system model. This can cause a lot of strange problems.
+Ubuntu is not designed to be run inside Docker. Its init system, Upstart, assumes that it's running on either real hardware or virtualized hardware, but not inside a Docker container. But inside a container you don't want a full system; you want a minimal system.  Configuring that minimal system for use within a container has many strange corner cases that are hard to get right if you are not intimately familiar with the Unix system model. This can cause a lot of strange problems.
 
 Baseimage-docker gets everything right. The "Contents" section describes all the things that it modifies.
 
@@ -22,7 +27,7 @@ Baseimage-docker gets everything right. The "Contents" section describes all the
 You can configure the stock `ubuntu` image yourself from your Dockerfile, so why bother using baseimage-docker?
 
  * Configuring the base system for Docker-friendliness is no easy task. As stated before, there are many corner cases. By the time that you've gotten all that right, you've reinvented baseimage-docker. Using baseimage-docker will save you from this effort.
- * It reduces the time needed to write a correct Dockerfile. You won't have to worry about the base system and can focus on your stack and your app.
+ * It reduces the time needed to write a correct Dockerfile. You won't have to worry about the base system and you can focus on the stack and the app.
  * It reduces the time needed to run `docker build`, allowing you to iterate your Dockerfile more quickly.
  * It reduces download time during redeploys. Docker only needs to download the base image once: during the first deploy. On every subsequent deploys, only the changes you make on top of the base image are downloaded.
 
@@ -52,6 +57,8 @@ 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)
    * [Running a command in an existing, running container](#run_inside_existing_container)
@@ -65,6 +72,7 @@ You can configure the stock `ubuntu` image yourself from your Dockerfile, so why
      * [Using your own key](#using_your_own_key)
      * [The `docker-ssh` tool](#docker_ssh)
  * [Building the image yourself](#building)
+  * [Removing optional services](#removing_optional_services)
  * [Conclusion](#conclusion)
 
 -----------------------------------------
@@ -79,24 +87,25 @@ You can configure the stock `ubuntu` image yourself from your Dockerfile, so why
 
 | Component        | Why is it included? / Remarks |
 | ---------------- | ------------------- |
-| Ubuntu 14.04 LTS | The base system. |
-| A **correct** init process | According to the Unix process model, [the init process](https://en.wikipedia.org/wiki/Init) -- PID 1 -- inherits all [orphaned child processes](https://en.wikipedia.org/wiki/Orphan_process) and must [reap them](https://en.wikipedia.org/wiki/Wait_(system_call)). Most Docker containers do not have an init process that does this correctly, and as a result their containers become filled with [zombie processes](https://en.wikipedia.org/wiki/Zombie_process) over time. <br><br>Furthermore, `docker stop` sends SIGTERM to the init process, which is then supposed to stop all services. Unfortunately most init systems don't do this correctly within Docker since they're built for hardware shutdowns instead. This causes processes to be hard killed with SIGKILL, which doesn't give them a chance to correctly deinitialize things. This can cause file corruption. <br><br>Baseimage-docker comes with an init process `/sbin/my_init` that performs both of these tasks correctly. |
+| Ubuntu 18.04 LTS | The base system. |
+| A **correct** init process | _Main article: [Docker and the PID 1 zombie reaping problem](http://blog.phusion.nl/2015/01/20/docker-and-the-pid-1-zombie-reaping-problem/)._ <br><br>According to the Unix process model, [the init process](https://en.wikipedia.org/wiki/Init) -- PID 1 -- inherits all [orphaned child processes](https://en.wikipedia.org/wiki/Orphan_process) and must [reap them](https://en.wikipedia.org/wiki/Wait_(system_call)). Most Docker containers do not have an init process that does this correctly. As a result, their containers become filled with [zombie processes](https://en.wikipedia.org/wiki/Zombie_process) over time. <br><br>Furthermore, `docker stop` sends SIGTERM to the init process, which stops all services. Unfortunately most init systems don't do this correctly within Docker since they're built for hardware shutdowns instead. This causes processes to be hard killed with SIGKILL, which doesn't give them a chance to correctly deinitialize things. This can cause file corruption. <br><br>Baseimage-docker comes with an init process `/sbin/my_init` that performs both of these tasks correctly. |
 | Fixes APT incompatibilities with Docker | See https://github.com/dotcloud/docker/issues/1024. |
-| syslog-ng | A syslog daemon is necessary so that many services - including the kernel itself - can correctly log to /var/log/syslog. If no syslog daemon is running, a lot of important messages are silently swallowed. <br><br>Only listens locally. All syslog messages are forwarded to "docker logs". |
+| syslog-ng | A syslog daemon is necessary so that many services - including the kernel itself - can correctly log to /var/log/syslog. If no syslog daemon is running, a lot of important messages are silently swallowed. <br><br>Only listens locally. All syslog messages are forwarded to "docker logs".<br><br>Why syslog-ng?<br>I've had bad experience with rsyslog. I regularly run into bugs with rsyslog, and once in a while it takes my log host down by entering a 100% CPU loop in which it can't do anything. Syslog-ng seems to be much more stable. |
 | logrotate | Rotates and compresses logs on a regular basis. |
 | SSH server | Allows you to easily login to your container to [inspect or administer](#login_ssh) things. <br><br>_SSH is **disabled by default** and is only one of the methods provided by baseimage-docker for this purpose. The other method is through [docker exec](#login_docker_exec). SSH is also provided as an alternative because `docker exec` comes with several caveats._<br><br>Password and challenge-response authentication are disabled by default. Only key authentication is allowed. |
 | 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?
 
 The Docker developers advocate the philosophy of running a single *logical service* per container. A logical service can consist of multiple OS processes.
 
-Baseimage-docker only advocates running multiple OS processes inside a single container. We believe this makes sense because at the very least it would solve [the PID 1 problem](#whats_inside_overview) and the "syslog blackhole" problem. By running multiple processes, we solve very real Unix OS-level problems, with minimal overhead and without turning the container into multiple logical services.
+Baseimage-docker only advocates running multiple OS processes inside a single container. We believe this makes sense because at the very least it would solve [the PID 1 problem](http://blog.phusion.nl/2015/01/20/docker-and-the-pid-1-zombie-reaping-problem/) and the "syslog blackhole" problem. By running multiple processes, we solve very real Unix OS-level problems, with minimal overhead and without turning the container into multiple logical services.
 
 Splitting your logical service into multiple OS processes also makes sense from a security standpoint. By running processes as different users, you can limit the impact of vulnerabilities. Baseimage-docker provides tools to encourage running processes as different users, e.g. the `setuser` tool.
 
@@ -105,11 +114,11 @@ Do we advocate running multiple *logical services* in a single container? Not ne
 <a name="fat_containers"></a>
 ### Does Baseimage-docker advocate "fat containers" or "treating containers as VMs"?
 
-There are people who are under the impression that Baseimage-docker advocates treating containers as VMs, because of the fact that Baseimage-docker advocates the use of multiple processes. Therefore they are also under the impression that Baseimage-docker does not follow the Docker philosophy. Neither of these impressions are true.
+There are people who think that Baseimage-docker advocates treating containers as VMs because Baseimage-docker advocates the use of multiple processes. Therefore, they also think that Baseimage-docker does not follow the Docker philosophy. Neither of these impressions are true.
 
-The Docker developers advocate running multiple *logical services* inside a single container. But we are not disputing that. Baseimage-docker advocates running multiple *OS processes* inside a single container, and a single logical service can consist of multiple OS processes.
+The Docker developers advocate running a single *logical service* inside a single container. But we are not disputing that. Baseimage-docker advocates running multiple *OS processes* inside a single container, and a single logical service can consist of multiple OS processes.
 
-It follows from this that Baseimage-docker also does not deny the Docker philosophy. In fact, many of the modifications we introduce are explicitly in line with the Docker philosophy. For example, using environment variables to pass parameters to containers is very much the "Docker way", and provide [a mechanism to easily work with environment variables](#environment_variables) in the presence of multiple processes that may run as different users.
+It follows that Baseimage-docker also does not deny the Docker philosophy. In fact, many of the modifications we introduce are explicitly in line with the Docker philosophy. For example, using environment variables to pass parameters to containers is very much the "Docker way", and providing [a mechanism to easily work with environment variables](#environment_variables) in the presence of multiple processes that may run as different users.
 
 <a name="inspecting"></a>
 ## Inspecting baseimage-docker
@@ -136,9 +145,6 @@ The image is called `phusion/baseimage`, and is available on the Docker registry
     # a list of version numbers.
     FROM phusion/baseimage:<VERSION>
 
-    # Set correct environment variables.
-    ENV HOME /root
-    
     # Use baseimage-docker's init system.
     CMD ["/sbin/my_init"]
 
@@ -150,23 +156,45 @@ The image is called `phusion/baseimage`, and is available on the Docker registry
 <a name="adding_additional_daemons"></a>
 ### Adding additional daemons
 
-You can add additional daemons (e.g. your own app) to the image by creating runit entries. You only have to write a small shell script which runs your daemon, and runit will keep it up and running for you, restarting it when it crashes, etc.
+A daemon is a program which runs in the background of its system, such
+as a web server.
 
-The shell script must be called `run`, must be executable, and is to be placed in the directory `/etc/service/<NAME>`.
+You can add additional daemons (for example, your own app) to the image
+by creating runit service directories. You only have to write a small
+shell script which runs your daemon;
+[`runsv`](http://smarden.org/runit/runsv.8.html) will start your script,
+and - by default - restart it upon its exit, after waiting one second.
 
-Here's an example showing you how a memcached server runit entry can be made.
+The shell script must be called `run`, must be executable, and is to be
+placed in the directory `/etc/service/<NAME>`. `runsv` will switch to
+the directory and invoke `./run` after your container starts.
 
-    ### In memcached.sh (make sure this file is chmod +x):
-    #!/bin/sh
-    # `/sbin/setuser memcache` runs the given command as the user `memcache`.
-    # If you omit that part, the command will be run as root.
-    exec /sbin/setuser memcache /usr/bin/memcached >>/var/log/memcached.log 2>&1
+**Be certain that you do not start your container using interactive mode
+(`-it`) with another command, as `runit` must be the first process to run. If you do this, your runit service directories won't be started. For instance, `docker run -it <name> bash` will bring you to bash in your container, but you'll lose all your daemons.**
 
-    ### In Dockerfile:
-    RUN mkdir /etc/service/memcached
-    ADD memcached.sh /etc/service/memcached/run
+Here's an example showing you how a `runit` service directory can be
+made for a `memcached` server.
 
-Note that the shell script must run the daemon **without letting it daemonize/fork it**. Usually, daemons provide a command line flag or a config file option for that.
+In `memcached.sh`, or whatever you choose to name your file (make sure
+this file is chmod +x):
+```bash
+#!/bin/sh
+# `/sbin/setuser memcache` runs the given command as the user `memcache`.
+# If you omit that part, the command will be run as root.
+exec /sbin/setuser memcache /usr/bin/memcached >>/var/log/memcached.log 2>&1
+```
+In an accompanying `Dockerfile`:
+
+```Dockerfile
+RUN mkdir /etc/service/memcached
+COPY memcached.sh /etc/service/memcached/run
+RUN chmod +x /etc/service/memcached/run
+```
+A given shell script must run **without daemonizing or forking itself**;
+this is because `runit` will start and restart your script on its own.
+Usually, daemons provide a command line flag or a config file option for
+preventing such behavior - essentially, you just want your script to run
+in the foreground, not the background.
 
 <a name="running_startup_scripts"></a>
 ### Running scripts during container startup
@@ -178,17 +206,44 @@ The baseimage-docker init system, `/sbin/my_init`, runs the following scripts du
 
 All scripts must exit correctly, e.g. with exit code 0. If any script exits with a non-zero exit code, the booting will fail.
 
+**Important note:** If you are executing the container in interactive mode (i.e. when you run a container with `-it`), rather than daemon mode, you are sending stdout directly to the terminal (`-i` interactive `-t` terminal). If you are not calling `/sbin/my_init` in your run declaration, `/sbin/my_init` will not be executed, therefore your scripts will not be called during container startup.
+
 The following example shows how you can add a startup script. This script simply logs the time of boot to the file /tmp/boottime.txt.
 
-    ### In logtime.sh (make sure this file is chmod +x):
+In `logtime.sh`:
+
     #!/bin/sh
     date > /tmp/boottime.txt
 
-    ### In Dockerfile:
+In `Dockerfile`:
+
     RUN mkdir -p /etc/my_init.d
-    ADD logtime.sh /etc/my_init.d/logtime.sh
+    COPY logtime.sh /etc/my_init.d/logtime.sh
+    RUN chmod +x /etc/my_init.d/logtime.sh
 
 <a name="environment_variables"></a>
+
+#### Shutting down your process
+
+`/sbin/my_init` handles termination of children processes at shutdown. When it receives a SIGTERM
+it will pass the signal onto the child processes for correct shutdown. If your process is started with
+a shell script, make sure you `exec` the actual process, otherwise the shell will receive the signal
+and not your process.
+
+`/sbin/my_init` will terminate processes after a 5 second timeout. This can be adjusted by setting
+environment variables:
+
+    # Give children processes 5 minutes to timeout
+    ENV KILL_PROCESS_TIMEOUT=300
+    # Give all other processes (such as those which have been forked) 5 minutes to timeout
+    ENV KILL_ALL_PROCESSES_TIMEOUT=300
+
+Note: Prior to 0.11.1, the default values for `KILL_PROCESS_TIMEOUT` and `KILL_ALL_PROCESSES_TIMEOUT`
+were 5 seconds. In version 0.11.1+ the default process timeout has been adjusted to 30 seconds to
+allow more time for containers to terminate gracefully. The default timeout of your container runtime
+may supersede this setting, for example Docker currently applies a [10s timeout](https://docs.docker.com/engine/reference/commandline/stop/#options)
+by default before sending SIGKILL, upon `docker stop` or receiving SIGTERM.
+
 ### Environment variables
 
 If you use `/sbin/my_init` as the main container command, then any environment variables set with `docker run --env` or with the `ENV` command in the Dockerfile, will be picked up by `my_init`. These variables will also be passed to all child processes, including `/etc/my_init.d` startup scripts, Runit and Runit-managed services. There are however a few caveats you should be aware of:
@@ -196,13 +251,14 @@ If you use `/sbin/my_init` as the main container command, then any environment v
  * Environment variables on Unix are inherited on a per-process basis. This means that it is generally not possible for a child process to change the environment variables of other processes.
  * Because of the aforementioned point, there is no good central place for defining environment variables for all applications and services. Debian has the `/etc/environment` file but it only works in some situations.
  * Some services change environment variables for child processes. Nginx is one such example: it removes all environment variables unless you explicitly instruct it to retain them through the `env` configuration option. If you host any applications on Nginx (e.g. using the [passenger-docker](https://github.com/phusion/passenger-docker) image, or using Phusion Passenger in your own image) then they will not see the environment variables that were originally passed by Docker.
+ * We ignore HOME, SHELL, USER and a bunch of other environment variables on purpose, because _not_ ignoring them will break multi-user containers. See https://github.com/phusion/baseimage-docker/pull/86 -- A workaround for setting the `HOME` environment variable looks like this: `RUN echo /root > /etc/container_environment/HOME`. See https://github.com/phusion/baseimage-docker/issues/119
 
 `my_init` provides a solution for all these caveats.
 
 <a name="envvar_central_definition"></a>
 #### Centrally defining your own environment variables
 
-During startup, before running any [startup scripts](#running_startup_scripts), `my_init` imports environment variables from the directory `/etc/container_environment`. This directory contains files who are named after the environment variable names. The file contents contain the environment variable values. This directory is therefore a good place to centrally define your own environment variables, which will be inherited by all startup scripts and Runit services.
+During startup, before running any [startup scripts](#running_startup_scripts), `my_init` imports environment variables from the directory `/etc/container_environment`. This directory contains files named after the environment variable names. The file contents contain the environment variable values. This directory is therefore a good place to centrally define your own environment variables, which will be inherited by all startup scripts and Runit services.
 
 For example, here's how you can define an environment variable from your Dockerfile:
 
@@ -218,14 +274,14 @@ You can verify that it works, as follows:
 
 **Handling newlines**
 
-If you've looked carefully, you'll notice that the 'echo' command actually prints a newline. Why does $MY_NAME not contain a newline then? It's because `my_init` strips the trailing newline, if any. If you intended on the value having a newline, you should add *another* newline, like this:
+If you've looked carefully, you'll notice that the 'echo' command actually prints a newline. Why does $MY_NAME not contain a newline then? It's because `my_init` strips the trailing newline. If you intended on the value having a newline, you should add *another* newline, like this:
 
     RUN echo -e "Apachai Hopachai\n" > /etc/container_environment/MY_NAME
 
 <a name="envvar_dumps"></a>
 #### Environment variable dumps
 
-While the previously mentioned mechanism is good for centrally defining environment variables, it by itself does not prevent services (e.g. Nginx) from changing and resetting environment variables from child processes. However, the `my_init` mechanism does make it easy for you to query what the original environment variables are.
+While the previously mentioned mechanism is good for centrally defining environment variables, itself does not prevent services (e.g. Nginx) from changing and resetting environment variables from child processes. However, the `my_init` mechanism does make it easy for you to query what the original environment variables are.
 
 During startup, right after importing environment variables from `/etc/container_environment`, `my_init` will dump all its environment variables (that is, all variables imported from `container_environment`, as well as all variables it picked up from `docker run --env`) to the following locations, in the following formats:
 
@@ -233,7 +289,7 @@ During startup, right after importing environment variables from `/etc/container
  * `/etc/container_environment.sh` - a dump of the environment variables in Bash format. You can source the file directly from a Bash shell script.
  * `/etc/container_environment.json` - a dump of the environment variables in JSON format.
 
-The multiple formats makes it easy for you to query the original environment variables no matter which language your scripts/apps are written in.
+The multiple formats make it easy for you to query the original environment variables no matter which language your scripts/apps are written in.
 
 Here is an example shell session showing you how the dumps look like:
 
@@ -266,13 +322,32 @@ But note that:
 <a name="envvar_security"></a>
 #### Security
 
-Because environment variables can potentially contain sensitive information, `/etc/container_environment` and its Bash and JSON dumps are by default owned by root, and accessible only by the `docker_env` group (so that any user added this group will have these variables automatically loaded).
+Because environment variables can potentially contain sensitive information, `/etc/container_environment` and its Bash and JSON dumps are by default owned by root, and accessible only to the `docker_env` group (so that any user added this group will have these variables automatically loaded).
 
 If you are sure that your environment variables don't contain sensitive data, then you can also relax the permissions on that directory and those files by making them world-readable:
 
     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
+
+Baseimage-docker images contain an Ubuntu operating system (see OS version at [Overview](#overview)). You may want to update this OS from time to time, for example to pull in the latest security updates. OpenSSL is a notorious example. Vulnerabilities are discovered in OpenSSL on a regular basis, so you should keep OpenSSL up-to-date as much as you can.
+
+While we release Baseimage-docker images with the latest OS updates from time to time, you do not have to rely on us. You can update the OS inside Baseimage-docker images yourself, and it is recommended that you do this instead of waiting for us.
+
+To upgrade the OS in the image, run this in your Dockerfile:
+
+    RUN apt-get update && apt-get upgrade -y -o Dpkg::Options::="--force-confold"
+
 <a name="container_administration"></a>
 ## Container administration
 
@@ -389,10 +464,23 @@ Baseimage-docker disables the SSH server by default. Add the following to your D
     # init system will auto-generate one during boot.
     RUN /etc/my_init.d/00_regen_ssh_host_keys.sh
 
+Alternatively, to enable sshd only for a single instance of your container, create a folder with a [startup script](#running_startup_scripts).  The contents of that should be
+
+    ### In myfolder/enable_ssh.sh (make sure this file is chmod +x):
+    #!/bin/sh
+    rm -f /etc/service/sshd/down
+    ssh-keygen -P "" -t dsa -f /etc/ssh/ssh_host_dsa_key
+
+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 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
 
-First, you must ensure that you have the right SSH keys installed inside the container. By default, no keys are installed, so nobody can login. For convenience reasons, we provide [a pregenerated, insecure key](https://github.com/phusion/baseimage-docker/blob/master/image/insecure_key) [(PuTTY format)](https://github.com/phusion/baseimage-docker/blob/master/image/insecure_key.ppk) that you can easily enable. However, please be aware that using this key is for convenience only. It does not provide any security because this key (both the public and the private side) is publicly available. **In production environments, you should use your own keys**.
+First, you must ensure that you have the right SSH keys installed inside the container. By default, no keys are installed, so nobody can login. For convenience reasons, we provide [a pregenerated, insecure key](https://github.com/phusion/baseimage-docker/blob/master/image/services/sshd/keys/insecure_key) [(PuTTY format)](https://github.com/phusion/baseimage-docker/blob/master/image/services/sshd/keys/insecure_key.ppk) that you can easily enable. However, please be aware that using this key is for convenience only. It does not provide any security because this key (both the public and the private side) is publicly available. **In production environments, you should use your own keys**.
 
 <a name="using_the_insecure_key_for_one_container_only"></a>
 #### Using the insecure key for one container only
@@ -414,7 +502,7 @@ Once you have the ID, look for its IP address with:
 Now that you have the IP address, you can use SSH to login to the container, or to execute a command inside it:
 
     # Download the insecure private key
-    curl -o insecure_key -fSL https://github.com/phusion/baseimage-docker/raw/master/image/insecure_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
@@ -432,7 +520,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
@@ -440,7 +528,7 @@ Instructions for logging in the container is the same as in section [Using the i
 Edit your Dockerfile to install an SSH public key:
 
     ## Install an SSH of your choice.
-    ADD your_key.pub /tmp/your_key.pub
+    COPY your_key.pub /tmp/your_key.pub
     RUN cat /tmp/your_key.pub >> /root/.ssh/authorized_keys && rm -f /tmp/your_key.pub
 
 Then rebuild your image. Once you have that, start a container based on that image:
@@ -509,6 +597,39 @@ If you want to call the resulting image something else, pass the NAME variable,
 
     make build NAME=joe/baseimage
 
+You can also change the `ubuntu` base-image to `debian` as these distributions are quite similar.
+
+    make build BASE_IMAGE=debian:stretch
+
+The image will be: `phusion/baseimage-debian-stretch`. Use the `NAME` variable in combination with the `BASE_IMAGE` one to call it `joe/stretch`.
+
+    make build BASE_IMAGE=debian:stretch NAME=joe/stretch
+
+To verify that the various services are started, when the image is run as a container, add `test` to the end of your make invocations, e.g.:
+
+    make build BASE_IMAGE=debian:stretch NAME=joe/stretch test
+
+
+<a name="removing_optional_services"></a>
+### Removing optional services
+
+The default baseimage-docker installs `syslog-ng`, `cron` and `sshd` services during the build process.
+
+In case you don't need one or more of these services in your image, you can disable its installation through the `image/buildconfig` that is sourced within `image/system_services.sh`.  Do this at build time by passing a variable in with `--build-arg`  as in `docker build --build-arg DISABLE_SYSLOG=1 image/`, or you may set the variable in `image/Dockerfile` with an ENV setting above the RUN directive.
+
+These represent build-time configuration, so setting them in the shell env at build-time [will not have any effect](https://github.com/phusion/baseimage-docker/issues/459#issuecomment-439177442).  Setting them in child images' Dockerfiles will also not have any effect.)
+
+You can also set them directly as shown in the following example, to prevent `sshd` from being installed into your image, set `1` to the `DISABLE_SSH` variable in the `./image/buildconfig` file.
+
+    ### In ./image/buildconfig
+    # ...
+    # Default services
+    # Set 1 to the service you want to disable
+    export DISABLE_SYSLOG=0
+    export DISABLE_SSH=1
+    export DISABLE_CRON=0
+
+Then you can proceed with `make build` command.
 
 <a name="conclusion"></a>
 ## Conclusion
@@ -516,7 +637,8 @@ If you want to call the resulting image something else, pass the NAME variable,
  * Using baseimage-docker? [Tweet about us](https://twitter.com/share) or [follow us on Twitter](https://twitter.com/phusion_nl).
  * Having problems? Want to participate in development? Please post a message at [the discussion forum](https://groups.google.com/d/forum/passenger-docker).
  * Looking for a more complete base image, one that is ideal for Ruby, Python, Node.js and Meteor web apps? Take a look at [passenger-docker](https://github.com/phusion/passenger-docker).
+ * Need a helping hand? Phusion also offers [consulting](https://www.phusion.nl/consultancy) on a wide range of topics, including Web Development, UI/UX Research & Design, Technology Migration and Auditing. 
 
-[<img src="http://www.phusion.nl/assets/logo.png">](http://www.phusion.nl/)
+[<img src="https://www.phusion.nl/images/mark_logotype.svg">](https://www.phusion.nl/)
 
 Please enjoy baseimage-docker, a product by [Phusion](http://www.phusion.nl/). :-)

README_ZH_cn_.md

@@ -1,570 +0,0 @@
-# 小巧玲珑的ubuntu镜像
-
-**This translation was last updated October 24, 2014.**
-
-Baseimage-docker是一个特殊的 [Docker](https://www.docker.com) 镜像，可以很优雅的将它用于docker镜像。相对于 Ubuntu, 有这些新增：
-
- * 修改之后，可以很友好的使用docker
- * 修复了一些docker的bug [some Docker bugs](#workaroud_modifying_etc_hosts).
- * 很有用的管理员工具
-
-你可以用它作为你自己的基础docker镜像。
-
-Baseimage-docker 可以从[the Docker registry](https://registry.hub.docker.com/u/phusion/baseimage/)获取到!
-
-### 原生的ubuntu基础镜像有什么问题呢？
-
-原生ubuntu不是设计为运行docker的。它是假设运行到真实硬件或者虚拟硬件上的，但不是docker容器。你运行docker容器，不需要一个完整的系统，你需要一个小巧的系统。如果你不熟悉unix系统，那么配制出来的精简系统会有很奇怪的问题。这样就可以导致很多奇奇怪怪的问题。
-
-Baseimage-docker 将错误都修正了。在"内容"部分,可以看到哪些内容修改过了.
-
-<a name="why_use"></a>
-### 为什么使用 baseimage-docker?
-
-你可以用原生`ubuntu`镜像作为你的Dockerfile,那为什么又麻烦的使用baseimage-docker呢?
-
- * 配置一个友好的基础镜像不是一个简单的任务.正如之前提到的,会很有的坑在里面.当你处理那些坑之后,你又重复造了一个baseimage-docker.使用baseimage-docker会拯救你的努力.
- * 它减少了一个写正确Dockerfile文件的时间.你不用担心基础系统,你可以专注你的业务和你的项目.
- * 它减少了运行`docker build`的时间,让你更快的迭代Dockerfile.
- * 它减少了多次下载的时间.Docker只需要下载一次基础镜像:在第一次部署的时候.在之后的部署中,只需要对你最近的基础镜像进行修改.
-
------------------------------------------
-
-**相关资源**
-
-  [Website](http://phusion.github.io/baseimage-docker/) |
-  [Github](https://github.com/phusion/baseimage-docker) |
-  [Docker registry](https://index.docker.io/u/phusion/baseimage/) |
-  [Discussion forum](https://groups.google.com/d/forum/passenger-docker) |
-  [Twitter](https://twitter.com/phusion_nl) |
-  [Blog](http://blog.phusion.nl/)
-
-**Table of contents**
-**目录**
-
- * [镜像里面包含什么?](#whats_inside)
-   * [概述](#whats_inside_overview)
-   * [等等,我认为docker在一个容器中只能允许一个进程?](#docker_single_process)
- * [细细看看baseimage-docker](#inspecting)
- * [用baseimage-docker作为基础镜像](#using)
-   * [开始](#getting_started)
-   * [增加后台进行](#adding_additional_daemons)
-   * [在启动容器过程中允许脚本](#running_startup_scripts)
-   * [环境变量](#environment_variables)
-     * [集中定义你自己的环境变量](#envvar_central_definition)
-     * [保存环境变量](#envvar_dumps)
-     * [修改环境变量](#modifying_envvars)
-     * [安全性](#envvar_security)
-   * [解决docker没有办法修改/etc/hosts的问题](#workaroud_modifying_etc_hosts)
-   * [禁用ssh](#disabling_ssh)
- * [容器管理](#container_administration)
-   * [在一个新容器中运行单条命令](#oneshot)
-   * [在正在运行的的容器中运行命令](#run_inside_existing_container)
-   * [通过nsenter登录容器](#login_nsenter)
-     * [用法](#nsenter_usage)
-     * [`docker-bash`工具](#docker_bash)
-   * [使用ssh登录容器](#login_ssh)
-     * [在容器中使用不安全的key](#using_the_insecure_key_for_one_container_only)
-     * [支持长久不变的不安全的key](#enabling_the_insecure_key_permanently)
-     * [使用你自己的key](#using_your_own_key)
-     * [`docker-ssh`工具](#docker_ssh)
- * [构建你自己的镜像](#building)
- * [总结](#conclusion)
-
------------------------------------------
-
-<a name="whats_inside"></a>
-## 镜像里面包含什么?
-
-<a name="whats_inside_overview"></a>
-### 概述
-
-*想看一个完整的基础镜像?这里有一个包含Ruby,Python Node.js and Meteor的.可以看看[passenger-docker](https://github.com/phusion/passenger-docker).*
-
-| 模块        | 包含什么 / 备注 |
-| ---------------- | ------------------- |
-| Ubuntu 14.04 LTS | 基础系统. |
-| 一个**正确**的初始化进程  | 根据Unix进程模型,[初始化进程](https://en.wikipedia.org/wiki/Init) -- PID 1 -- 继承了所有[孤立的子进行],并且必须[监控他们](https://en.wikipedia.org/wiki/Wait_(system_call)).大多数Docker容器没有一个正确的初始化进程,结果是他们的容器就出现了大量的[僵尸进程](https://en.wikipedia.org/wiki/Zombie_process).<br><br>此外,`docker stop`发送终止信号给初始化进程,然后停止所有的服务进程.不幸的是,由于他们主机关闭了容器,大多初始系统没有正确运行.<br><br>Baseimage-docker包含了一个初始进程`/sbin/my_init`,来正确的执行这些任务. |
-| 修复了APT 与docker不兼容的问题 | See https://github.com/dotcloud/docker/issues/1024. |
-| 修复某些Docker bugs | [Learn more.](#workaroud_modifying_etc_hosts) |
-| syslog-ng | 必须要有一个监控很多服务的系统日志进程,包括内核本身,以便可以正确的输出日志到/var/log/syslog.如果没有后台日志进程,那么很多重要的信息就会丢失了.<br><br>只监听本地服务. |
-| logrotate | logrotate 程序是一个日志文件管理工具,可以定期转存和压缩日志. |
-| SSH server | 允许你可以很容易的登录到你的容器中进行[管理](#login_ssh).<br><br>_baseimage-docker提供了一个SSH的方法.还有其他方法,比如通过[nsenter](#login_nsenter).SSH提供了一个方法,因为nsenter还有很多的问题._<br><br>通过密码和challenge-response的方式,默认是禁用的.只有通过key认证的方式是允许的.<br><br>如果你想禁用SSH访问的方式,禁用也是很容易的.可以阅读下面的说明. |
-| cron | 定时任务进程保证定时任务的运行. |
-| [runit](http://smarden.org/runit/) | 替代Ubuntu的Upstart. 用于监控服务和管理.比SysV init更容易使用,同时支持当有服务挂掉之后,重启这些服务.比Upstart更易使用,也更加的轻量级. |
-| `setuser` |使用另一个用户运行命令的工具,比`su`更容易使用,减少使用`sudo`的安全性,不像使用`chpst`,需要正确的设置`$HOME`.`/sbin/setuser`这样使用就可以了. |
-Baseimage-docker is very lightweight: it only consumes 6 MB of memory.
-Baseimage-docker是非常轻量级的:仅仅小号6MB内存.
-
-<a name="docker_single_process"></a>
-### 等等,我认为Docker在一个容器中就运行一个进程吗?
-绝对不是这样的. 在一个docker容器中,运行多个进程也是很好的. 事实上,没有什么技术原因限制你只运行一个进程,运行很多的进程,只会把容器中系统的基本功能搞的更乱,比如syslog.
-
-Baseimage-docker *鼓励* 通过runit来运行多进程.
-
-<a name="inspecting"></a>
-## 检测一下baseimage-docker
-
-要检测镜像,执行下面的命令:
-
-    docker run --rm -t -i phusion/baseimage:<VERSION> /sbin/my_init -- bash -l
-
-`<VERSION>` 是[baseimage-docker的版本号](https://github.com/phusion/baseimage-docker/blob/master/Changelog.md).
-
-你不用手动去下载任何文件.上面的命令会自动从docker仓库下载baseimage-docker镜像.
-
-<a name="using"></a>
-## 使用baseimage-docker作为基础镜像
-
-<a name="getting_started"></a>
-### 入门指南
-
-The image is called `phusion/baseimage`, and is available on the Docker registry.
-镜像名字叫`phusion/baseimage`,在Docker仓库上也是可用的.
-
-下面的这个是一个Dockerfile的模板.
-
-	# 使用phusion/baseimage作为基础镜像,去构建你自己的镜像,需要下载一个明确的版本,千万不要使用`latest`.
-	# 查看https://github.com/phusion/baseimage-docker/blob/master/Changelog.md,可用看到版本的列表.
-	FROM phusion/baseimage:<VERSION>
-	
-	# 设置正确的环境变量.
-	ENV HOME /root
-	
-	# 生成SSH keys,baseimage-docker不包含任何的key,所以需要你自己生成.你也可以注释掉这句命令,系统在启动过程中,会生成一个.
-	RUN /etc/my_init.d/00_regen_ssh_host_keys.sh
-	
-	# 初始化baseimage-docker系统
-	CMD ["/sbin/my_init"]
-	
-	# 这里可以放置你自己需要构建的命令
-	
-	# 当完成后,清除APT.
-	RUN apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
-
-
-<a name="adding_additional_daemons"></a>
-### 增加后台进程
-
-你可以通过runit工具向你的镜像中添加后台进程(例如:你自己的某些应用).你需要编写一个运行你需要的后台进程的脚步就可以了,runit工具会保证它的正常运行,如果进程死掉,runit也会重启它的.
-
-脚本的名称必须是`run`,必须是可以运行的,它需要放到`/etc/service/<NAME>`.
-
-这里有一个例子,向你展示如果运行memcached服务的.
-
-	### memcached.sh(确定文件的权限是chmod +x):
-	#!/bin/sh
-	# `/sbin/setuser memcache` 指定一个`memcache`用户来运行命令.如果你忽略了这部分,就会使用root用户执行.
-	exec /sbin/setuser memcache /usr/bin/memcached >>/var/log/memcached.log 2>&1
-	
-	### 在Dockerfile中:
-    RUN mkdir /etc/service/memcached
-    ADD memcached.sh /etc/service/memcached/run
-
-注意脚本必须运行在后台的,**不能让他们进程进行daemonize/fork**.通常,后台进程会提供一个标志位或者配置文件.
-
-<a name="running_startup_scripts"></a>
-### 在容器启动的时候,运行脚本.
-
-baseimage-docker的初始化脚本 `/sbin/my_init`,在启动的时候进程运行,按照下面的顺序:
-
- * 如果`/etc/my_init.d`存在,则按照字母顺序执行脚本.
- * 如果`/etc/rc.local`存在,则执行里面的脚本.
-
-所有的脚本都是正确退出的,例如:退出的code是0.如果有任何脚本以非0的code退出,启动就会失败.
-
-下面的例子向你展示了怎么添加一个启动脚本.这个脚本很简单的记录的一个系统启动时间,将启动时间记录到/tmp/boottime.txt.
-
-    ### 在 logtime.sh (文件权限chmod +x):
-    #!/bin/sh
-    date > /tmp/boottime.txt
-
-    ### 在 Dockerfile中:
-    RUN mkdir -p /etc/my_init.d
-    ADD logtime.sh /etc/my_init.d/logtime.sh
-
-
-<a name="environment_variables"></a>
-### 环境变量
-
-如果你使用`/sbin/my_init`作为主容器命令,那么通过`docker run --env`或者在Dockerfile文件中设置的`ENV`环境变量,都会被`my_init`读取.
-
- * 在Unix系统中,环境变量都会被子进程给继承.这就意味着,子进程不可能修改环境变量或者修改其他进程的环境变量.
- * 由于上面提到的一点,这里没有一个可以为所有应用和服务集中定义环境的地方.Debian提供了一个`/etc/environment` 文件,解决一些问题.
- * 某些服务更改环境变量是为了给子进程使用.Nginx有这样的一个例子:它移除了所有的环境变量,除非你通过`env`进行了配置,明确了某些是保留的.如果你部署了任何应用在Nginx镜像(例如:使用[passenger-docker](https://github.com/phusion/passenger-docker)镜像或者使用Phusion Passenger作为你的镜像.),那么你通过Docker,你不会看到任何环境变量.
- 
-
-`my_init`提供了一个办法来解决这些问题.
-
-<a name="envvar_central_definition"></a>
-#### 集中定义你的环境变量
-
-在启动的时候,在执行[startup scripts](#running_startup_scripts),`my_init`会从`/etc/container_environment`导入环境变量.这个文件夹下面,包含的文件,文件被命名为环境变量的名字.文件内容就是环境变量的值.这个文件夹是因此是一个集中定义你的环境变量的好地方,它会继承到所有启动项目和Runit管理的服务中.
-
-给个例子,在你的dockerfile如何定义一个环境变量:
-
-    RUN echo Apachai Hopachai > /etc/container_environment/MY_NAME
-
-你可以按照下面这样验证:
-
-    $ docker run -t -i <YOUR_NAME_IMAGE> /sbin/my_init -- bash -l
-    ...
-    *** Running bash -l...
-    # echo $MY_NAME
-    Apachai Hopachai
-
-**换行处理**
-
-如果你观察仔细一点,你会注意到'echo'命令,实际上在它是在新行打印出来的.为什么$MY_NAME没有包含在一行呢? 因为`my_init`在尾部有个换行字符.如果你打算让你的值包含一个新行,你需要增*另外*一个新字符,像这样:
-
-    RUN echo -e "Apachai Hopachai\n" > /etc/container_environment/MY_NAME
-
-<a name="envvar_dumps"></a>
-#### 环境变量存储
-
-上面提到集中定义环境变量,它不会从子服务进程改变父服务进程或者重置环境变量.而且,`my_init`也会很容易的让你查询到原始的环境变量是什么.
-
-在启动的时候,`/etc/container_environment`, `my_init`中的变量会存储起来,并且导入到环境变量中,例如一下的格式:
-
- * `/etc/container_environment`
- * `/etc/container_environment.sh`- 一个bash存储的环境变量格式.你可以从这个命令中得到base格式的文件.
- * `/etc/container_environment.json` - 一个json格式存储的环境变量格式.
-
-多种格式可以让你不管采用什么语言/apps都可以很容易使用环境变量.
-
-这里有个例子,展示怎么使用:
-
-    $ docker run -t -i \
-      --env FOO=bar --env HELLO='my beautiful world' \
-      phusion/baseimage:<VERSION> /sbin/my_init -- \
-      bash -l
-    ...
-    *** Running bash -l...
-    # ls /etc/container_environment
-    FOO  HELLO  HOME  HOSTNAME  PATH  TERM  container
-    # cat /etc/container_environment/HELLO; echo
-    my beautiful world
-    # cat /etc/container_environment.json; echo
-    {"TERM": "xterm", "container": "lxc", "HOSTNAME": "f45449f06950", "HOME": "/root", "PATH": "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin", "FOO": "bar", "HELLO": "my beautiful world"}
-    # source /etc/container_environment.sh
-    # echo $HELLO
-    my beautiful world
-
-<a name="modifying_envvars"></a>
-#### 修改环境变量
-
-通过修改`/etc/container_environment`这个文件,很有可能修改了`my_init`中的环境变量.之后,每次`my_init`启动[启动脚本](#running_startup_scripts),就会重置掉我们自己`/etc/container_environment`中的环境变量,也就会导致`container_environment.sh`和`container_environment.json`重新存储.
-
-但是记住这些:
-
- * 修改`container_environment.sh` 和 `container_environment.json`是没有效果的.
- * Runit 的服务是不能像这样修改环境变量的.`my_init`运行的时候,只对`/etc/container_environment`中的修改是生效的.
-
-<a name="envvar_security"></a>
-#### 安全
-
-因为环境变量可能包含敏感信息, `/etc/container_environment`和它的bash文件和JSON文件,默认都是root,都是可以被`docker_env`群组可以访问的(所以任何用户只要添加到群组中,都可以自动的获取这些信息).
-
-如果你确定你的环境变量中没有什么敏感信息,那么你可以放松管理权限,将文件夹和文件分配下面的权限:
-
-    RUN chmod 755 /etc/container_environment
-    RUN chmod 644 /etc/container_environment.sh /etc/container_environment.json
-
-<a name="workaroud_modifying_etc_hosts"></a>
-### 解决Docker没有办法解决的/etc/hosts的问题
-
-当前是没有办法在docker容器中修改`/etc/hosts`,这个是因为[Docker bug 2267](https://github.com/dotcloud/docker/issues/2267).Baseimage-docker包含了解决这个问题的办法,你必须明白是怎么修改的.
-
-修改的办法包含在系统库中的` libnss_files.so.2`文件,这个文件使用`/etc/workaround-docker-2267/hosts`来代替系统使用`/etc/hosts`.如果需要修改`/etc/hosts`,你只要修改`/etc/workaround-docker-2267/hosts`就可以了.
-
-增加这个修改到你的Dockerfile.下面的命令修改了文件`libnss_files.so.2`.
-
-    RUN /usr/bin/workaround-docker-2267
-
-(其实你不用在Dockerfile文件中运行这个命令,你可以在容器中运行一个shell就可以了.)
-
-验证一下它是否生效了,[在你的容器中打开一个shell](#inspecting),修改`/etc/workaround-docker-2267/hosts`,检查一下是否生效了:
-
-    bash# echo 127.0.0.1 my-test-domain.com >> /etc/workaround-docker-2267/hosts
-    bash# ping my-test-domain.com
-    ...should ping 127.0.0.1...
-
-**注意apt-get升级:** 如果Ubuntu升级,就有可能将`libnss_files.so.2`覆盖掉,那么修改就会失效.你必须重新运行`/usr/bin/workaround-docker-2267`.为了安全一点,你应该在运行`apt-get upgrade`之后,运行一下这个命令.
-
-<a name="disabling_ssh"></a>
-### 禁用SSH
-Baseimage-docker默认是支持SSH的,所以可以[使用SSH](#login_ssh)来[管理你的容器](#container_administration).万一你不想支持SSH,你可以只要禁用它:
-
-    RUN rm -rf /etc/service/sshd /etc/my_init.d/00_regen_ssh_host_keys.sh
-
-<a name="container_administration"></a>
-## 容器管理
-
-一个优秀的docker想法,就是docker是一个无状态的,容易启动的容器,就想一个黑盒子.然而,你可能遇到某种情况,需要登录到容器,或者运行命令在容器中.或者为了开发,需要查看或者debug的目的.这章就给你讲解怎么管理容器.
-
-
-<a name="oneshot"></a>
-### 在一个新容器中运行一个一闪而过的命令
-
-_**备注:** 这章讲解怎么在一个-新-容器中运行命令.要在一个存在的容器中运行命令,请查看[在一个存在的容器中,运行一个命令](#run_inside_existing_container)._
-
-正常情况下,当你创建了一个新容器,为了在容器中运行一个单独的命令,而且在运行之后会立即退出的,你会这样调用docker命令:
-
-    docker run YOUR_IMAGE COMMAND ARGUMENTS...
-
-然而下面的方法初始化系统的进行是不会启动.它是这样的,当调用`COMMAND`的时候,重要的后台进程,例如定时任务和系统日志都是不运行的.同样,子进程也是不会出现的,因为`COMMAND`的pid是1.
-
-Baseimage-docker提供了一个灵活的方式运行只要一闪而过的命令,同时也解决了上述所说的问题.以一下的方式运行一条命令:
-
-    docker run YOUR_IMAGE /sbin/my_init -- COMMAND ARGUMENTS ...
-
-他们会按照下面的流程执行:
-
- * 运行所有的启动文件,例如 /etc/my_init.d/* and /etc/rc.local.
- * 运行所有的runit服务
- * 运行指定的命令
- * 运行指定的命令结束之后,结束所有runit服务.
-
-例如:
-
-    $ docker run phusion/baseimage:<VERSION> /sbin/my_init -- ls
-    *** Running /etc/my_init.d/00_regen_ssh_host_keys.sh...
-    No SSH host key available. Generating one...
-    Creating SSH2 RSA key; this may take some time ...
-    Creating SSH2 DSA key; this may take some time ...
-    Creating SSH2 ECDSA key; this may take some time ...
-    *** Running /etc/rc.local...
-    *** Booting runit daemon...
-    *** Runit started as PID 80
-    *** Running ls...
-    bin  boot  dev  etc  home  image  lib  lib64  media  mnt  opt  proc  root  run  sbin  selinux  srv  sys  tmp  usr  var
-    *** ls exited with exit code 0.
-    *** Shutting down runit daemon (PID 80)...
-    *** Killing all processes...
-
-你会发现默认的启动的流程太负责.或者你不希望执行启动文件.你可以自定义所有通过给`my_init`增加参数.调用`docker run YOUR_IMAGE /sbin/my_init --help`可以看到帮助信息.
-
-例如上面运行`ls`命令,同时要求不运行启动脚本,减少信息打印,运行runit所有命令.
-
-    $ docker run phusion/baseimage:<VERSION> /sbin/my_init --skip-startup-files --quiet -- ls
-    bin  boot  dev  etc  home  image  lib  lib64  media  mnt  opt  proc  root  run  sbin  selinux  srv  sys  tmp  usr  var
-
-<a name="run_inside_existing_container"></a>
-### 在一个已经运行的容器中,运行一条命令
-
-这里有两种办法去在一个已经运行的容器中运行命令.
-
- * 通过`nseneter`工具.这个工具用于Linux内核调用在内嵌容器中运行命令.可以查看[通过`nsenter`,登录容器或者在容器内执行命令](#login_nsenter).
- * 通过SSH.这种办法需要在容器中运行ssh服务,而且需要你创建自己的sshkey.可以查看[通过`ssh`,登录容器或者在容器内执行命令](#login_ssh).
-
-两种方法都是他们各自的优点和确定,你可以学习他们各自的章节来了他们.
-
-<a name="login_nsenter"></a>
-### 通过`nsenter`,登录容器或者在容器内执行命令
-
-你可以使用在docker主机上面的`nsenter`工具,来登录任何基于baseimage-docker的docker容器.你可以使用它在你的容器中运行命令.
-
-这里有个和[通过`ssh`,登录容器或者在容器内执行命令](#login_ssh)的优缺点的比较:
-
- * 优点
-   * 不需要在容器中运行ssh服务.
-   * 不需要ssh key.
-   * 运行在任何容器上,甚至不是基于baseimage-docker的容器.
- * 缺点
-   * 通过`nsenter`运行的进程会和正常运行稍微有不同.例如,他们不同结束掉在容器中正常运行的进程.这适用于所有的子进程.
-   * 如果`nsenter`进程被其他命令(如`kill`命令)给终止,然后由nsenter所执行的命令,是*不会*被结束的.你将不得不手动清理.(备注:终端控制命令像Ctrl-C *会* 清理所有的子进程,因为终端信号被发送到所有流程的终端会话)
-   * 需要学习新工具.
-   * 需要在docker主机上面提供root权限.
-   * 需要在docker主机上面是可用的.在写这篇文字的时候(2014年7月),大多数linux发行版没有加载它.然而,baseimage-docker提供了预编译的二进制文件,允许你通过[docker-bash](#docker_bash)工具,来很容易的使用它.
-   * 不可能没有登录到docker主机,就登录到docker容器中.(也就是说,你必须登录到docker主机,通过docker主机登录到容器.)
-
-<a name="nsenter_usage"></a>
-#### 用例
-
-第一,确定`nsenter`已经安装了.在写这篇文字的时候(2014年7月),大多数linux发行版没有加载它.然而,baseimage-docker提供了预编译的二进制文件,允许你通过[docker-bash](#docker_bash)工具,让任何人都可以使用.
-
-接着,启动一个容器.
-
-    docker run YOUR_IMAGE
-
-找出你刚才运行容器的`ID`.
-
-    docker ps
-
-一旦拥有容器的id,找到运行容器的主要进程额`PID`.
-
-    docker inspect -f "{{ .State.Pid }}" <ID>
-
-现在你有的容器的主进程的PID,就可以使用`nsenter`来登录容器,或者在容器里面执行命令:
-
-    # 登录容器
-    nsenter --target <MAIN PROCESS PID> --mount --uts --ipc --net --pid bash -l
-
-    # 在容器中执行命令
-    nsenter --target <MAIN PROCESS PID> --mount --uts --ipc --net --pid -- echo hello world
-
-<a name="docker_bash"></a>
-#### `docker-bash`工具
-
-查找一个容器的主要进程的PID和输入这么长的nsenter命令很快会变得乏味无论.幸运的是,我们提供了一个`docker-bash` 工具,它可以自动完成只要的工具.这个工具是运行在*docker主机*上面,不是在docker容器中.
-
-该工具还附带了一个预编译的二进制`nsenter`,这样你不需要自己安装`nsenter`了.`docker-bash`是很简单的使用的.
-
-首先,在docker主机上安装这个工具:
-
-    curl --fail -L -O https://github.com/phusion/baseimage-docker/archive/master.tar.gz && \
-    tar xzf master.tar.gz && \
-    sudo ./baseimage-docker-master/install-tools.sh
-
-运行这个工具登录到容器中:
-
-    docker-bash YOUR-CONTAINER-ID
-
-你可以通过`docker ps`来查找你的容器ID.
-
-默认,`docker-bash`会打开一个bash 回话.你可以告诉运行什么命令,之后就会自动退出:
-
-    docker-bash YOUR-CONTAINER-ID echo hello world
-
-<a name="login_ssh"></a>
-### 通过`ssh`,登录容器或者在容器内执行命令
-
-你可以使用ssh来登录任何基于baseimage-docker的容器.你可以使用它在容器中执行命令.
-
-这里有个和[通过`nsenter`,登录容器或者在容器内执行命令](#login_nsenter)的优缺点的比较:
-
- * 优点
-   * 不像`nsenter`一样,运行在docker主机上面.几乎每个人都会安装一个ssh客户端.
-   * 不想使用`nsenter`,运行的进程和正在的进程会不一样.
-   * 不需要docker主机提供root权限.
-   * 运行你让用户登录到容器,而不需要登录到docker主机.然而,默认这是不启用的,因为baseimage-docker默认不是开放ssh服务的.
- *　缺点
-   * 需要设置ssh key.然而,baseimage-docker会提供一中办法,会让key的生成会很容器.阅读更多信息.
-
-第一件事情,就是你需要确定你在容器中已经安装设置了ssh key. 默认,没有任何安装key的,所有你无法登录.为了方便的原因,我们提供了一个[已经生成的key](https://github.com/phusion/baseimage-docker/blob/master/image/insecure_key) [(PuTTY format)](https://github.com/phusion/baseimage-docker/blob/master/image/insecure_key.ppk),为了让你使用方便.然后,请注意这个key仅仅是为方便.他没有任何安全行,因为它的key是在网络上提供的.**在生产环境,你必须使用你自己的key.**
-
-
-<a name="using_the_insecure_key_for_one_container_only"></a>
-#### 在容器中使用key
-
-你可以临时的使用key仅仅作为容器使用.这就以为这key是安装在容器上的.如果你使用`docker stop`和`docker start`控制容器,那么key是在容器中,但是如果你使用`docker run`开启一个新容器,那么这个容器是不包含key的.
-
-启动新容器包含key`--enable-insecure-key`:
-
-    docker run YOUR_IMAGE /sbin/my_init --enable-insecure-key
-
-找出你的刚才运行的容器的ID:
-
-    docker ps
-
-一旦你拥有容器的ID,就能找到容器使用的IP地址:
-
-    docker inspect -f "{{ .NetworkSettings.IPAddress }}" <ID>
-
-现在你有得了IP地址,你就看通过SSH来登录容器,或者在容器中执行命令了:
-
-    # 下载key
-    curl -o insecure_key -fSL https://github.com/phusion/baseimage-docker/raw/master/image/insecure_key
-    chmod 600 insecure_key
-
-    # 登录容器
-    ssh -i insecure_key root@<IP address>
-
-    # 在容器中执行命令
-    ssh -i insecure_key root@<IP address> echo hello world
-
-<a name="enabling_the_insecure_key_permanently"></a>
-#### 支持一个长久的key
-
-在一个长久存在的镜像中支持一个key是很可能的.一般是不推荐这么做,但是对于临时开始或者做demo演示,对安全要求不高,还是很合适的.
-
-编辑你的dockerfile,来安装永久的key:
-
-    RUN /usr/sbin/enable_insecure_key
-
-在容器中怎么使用,同[在容器中使用key](#using_the_insecure_key_for_one_container_only)的章节说的一样.
-
-<a name="using_your_own_key"></a>
-#### 使用你自己的key
-
-编辑你的dockerfile,来安装ssh public key:
-
-    ## 安装你自己的public key.
-    ADD your_key.pub /tmp/your_key.pub
-    RUN cat /tmp/your_key.pub >> /root/.ssh/authorized_keys && rm -f /tmp/your_key.pub
-
-重新创建你的镜像.一旦你创建成功,启动基于这个镜像的容器.
-
-    docker run your-image-name
-
-找出你的刚才运行的容器的ID:
-
-    docker ps
-
-一旦你拥有容器的ID,就能找到容器使用的IP地址:
-
-    docker inspect -f "{{ .NetworkSettings.IPAddress }}" <ID>
-
-现在你有得了IP地址,你就看通过SSH来登录容器,或者在容器中执行命令了:
-
-    # 登录容器
-    ssh -i /path-to/your_key root@<IP address>
-
-    # 在容器中执行命令
-    ssh -i /path-to/your_key root@<IP address> echo hello world
-
-<a name="docker_ssh"></a>
-#### `docker-ssh`工具
-
-找到容器的IP,运行ssh命令,很快会变得乏味无聊.幸运的是,我们提供了一个`docker-ssh`,可以自动完成这些事情.这个工具是运行在*Docker 主机*上的,不是安装在docker容器中的.
-
-首先,在docker主机上面安装这个工具.
-
-    curl --fail -L -O https://github.com/phusion/baseimage-docker/archive/master.tar.gz && \
-    tar xzf master.tar.gz && \
-    sudo ./baseimage-docker-master/install-tools.sh
-
-使用这个工具通过ssh登录容器:
-
-    docker-ssh YOUR-CONTAINER-ID
-
-你可以使用`docker ps`找到`YOUR-CONTAINER-ID`.
-
-默认,`docker-bash`会打开一个bash 回话.你可以告诉运行什么命令,之后就会自动退出:
-
-    docker-ssh YOUR-CONTAINER-ID echo hello world
-
-<a name="building"></a>
-## 创建你自己的镜像
-
-如果某些原因,你需要创建你自己的镜像,来替代从docker仓库下载镜像,可以按照的说明.
-
-克隆仓库:
-
-    git clone https://github.com/phusion/baseimage-docker.git
-    cd baseimage-docker
-
-创建一个包含docker在的虚拟机.你可以使用我们提供的Vagrantfile.
-
-    vagrant up
-    vagrant ssh
-    cd /vagrant
-
-编译镜像:
-
-    make build
-
-如果你想把创建的镜像名字,叫其他名字,通过`NAME`变量可以设置:
-
-    make build NAME=joe/baseimage
-
-<a name="conclusion"></a>
-## 总结
-
- * Using baseimage-docker? [Tweet about us](https://twitter.com/share) or [follow us on Twitter](https://twitter.com/phusion_nl).
- * Having problems? Want to participate in development? Please post a message at [the discussion forum](https://groups.google.com/d/forum/passenger-docker).
- * Looking for a more complete base image, one that is ideal for Ruby, Python, Node.js and Meteor web apps? Take a look at [passenger-docker](https://github.com/phusion/passenger-docker).
-
-[<img src="http://www.phusion.nl/assets/logo.png">](http://www.phusion.nl/)
-
-Please enjoy baseimage-docker, a product by [Phusion](http://www.phusion.nl/). :-)

build-multiarch.sh

@@ -0,0 +1,22 @@
+#!/bin/bash
+set -e
+set -x
+
+for arch in $ARCHS; do
+    docker pull $NAME:$VERSION-${arch}
+
+    if [[ $TAG_LATEST != 'true' ]]; then 
+        docker manifest create --amend $NAME:$VERSION $NAME:$VERSION-${arch}
+        docker manifest annotate $NAME:$VERSION $NAME:$VERSION-${arch} --arch ${arch}
+    else
+        docker manifest create --amend $NAME:latest $NAME:$VERSION-${arch}
+        docker manifest annotate $NAME:latest $NAME:$VERSION-${arch} --arch ${arch}
+    fi
+done
+
+echo "Push manifests"
+if [[ $TAG_LATEST != 'true' ]]; then 
+    docker manifest push $NAME:$VERSION
+else
+    docker manifest push $NAME:latest
+fi

build.sh

@@ -0,0 +1,19 @@
+#!/bin/bash
+set -e
+
+# # Prepare qemu
+# if [ '$QEMU_ARCH' != 'amd64' ]; then
+#     # docker run --rm --privileged multiarch/qemu-user-static:register --reset
+# fi
+
+# Get qemu package
+echo "Getting qemu package for $QEMU_ARCH"
+
+# Fake qemu for amd64 builds to avoid breaking COPY in Dockerfile
+if [ $QEMU_ARCH == 'amd64' ]; then
+    touch x86_64_qemu-"$QEMU_ARCH"-static.tar.gz
+    mv x86_64_qemu-${QEMU_ARCH}-static.tar.gz image
+else
+    curl -L -o x86_64_qemu-"$QEMU_ARCH"-static.tar.gz https://github.com/multiarch/qemu-user-static/releases/download/"$QEMU_VERSION"/x86_64_qemu-"$QEMU_ARCH"-static.tar.gz
+    mv x86_64_qemu-${QEMU_ARCH}-static.tar.gz image
+fi

image/Dockerfile

@@ -1,12 +1,20 @@
-FROM ubuntu:14.04
-MAINTAINER Phusion <info@phusion.nl>
+ARG BASE_IMAGE=ubuntu:18.04
+FROM $BASE_IMAGE
+MAINTAINER Iwan <iwanpub.phusion_fr@mg.familleclement.space>
 
-ENV HOME /root
-ADD . /build
+ARG QEMU_ARCH
+ADD x86_64_qemu-${QEMU_ARCH}-static.tar.gz /usr/bin
 
-RUN /build/prepare.sh && \
-	/build/system_services.sh && \
-	/build/utilities.sh && \
-	/build/cleanup.sh
+COPY . /bd_build
+
+RUN /bd_build/prepare.sh && \
+	/bd_build/system_services.sh && \
+	/bd_build/utilities.sh && \
+	/bd_build/cleanup.sh
+
+ENV DEBIAN_FRONTEND="teletype" \
+    LANG="fr_FR.UTF-8" \
+    LANGUAGE="fr_FR:fr" \
+    LC_ALL="fr_FR.UTF-8"
 
 CMD ["/sbin/my_init"]

image/bin/install_clean

@@ -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/*

image/bin/my_init

@@ -1,340 +1,420 @@
 #!/usr/bin/python3 -u
-import os, os.path, sys, stat, signal, errno, argparse, time, json, re
+# -*- coding: utf-8 -*-
 
-KILL_PROCESS_TIMEOUT = 5
-KILL_ALL_PROCESSES_TIMEOUT = 5
+import argparse
+import errno
+import json
+import os
+import os.path
+import re
+import signal
+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', 30))
+KILL_ALL_PROCESSES_TIMEOUT = int(os.environ.get('KILL_ALL_PROCESSES_TIMEOUT', 30))
 
 LOG_LEVEL_ERROR = 1
-LOG_LEVEL_WARN  = 1
-LOG_LEVEL_INFO  = 2
+LOG_LEVEL_WARN = 1
+LOG_LEVEL_INFO = 2
 LOG_LEVEL_DEBUG = 3
 
+SHENV_NAME_WHITELIST_REGEX = re.compile('\W')
+
 log_level = None
 
 terminated_child_processes = {}
 
-class AlarmException(Exception):
-	pass
-
-def error(message):
-	if log_level >= LOG_LEVEL_ERROR:
-		sys.stderr.write("*** %s\n" % message)
-
-def warn(message):
-	if log_level >= LOG_LEVEL_WARN:
-		sys.stderr.write("*** %s\n" % message)
-
-def info(message):
-	if log_level >= LOG_LEVEL_INFO:
-		sys.stderr.write("*** %s\n" % message)
-
-def debug(message):
-	if log_level >= LOG_LEVEL_DEBUG:
-		sys.stderr.write("*** %s\n" % message)
-
-def ignore_signals_and_raise_keyboard_interrupt(signame):
-	signal.signal(signal.SIGTERM, signal.SIG_IGN)
-	signal.signal(signal.SIGINT, signal.SIG_IGN)
-	raise KeyboardInterrupt(signame)
-
-def raise_alarm_exception():
-	raise AlarmException('Alarm')
-
-def listdir(path):
-	try:
-		result = os.stat(path)
-	except OSError:
-		return []
-	if stat.S_ISDIR(result.st_mode):
-		return sorted(os.listdir(path))
-	else:
-		return []
-
-def is_exe(path):
-	try:
-		return os.path.isfile(path) and os.access(path, os.X_OK)
-	except OSError:
-		return False
-
-def import_envvars(clear_existing_environment = True, override_existing_environment = True):
-	new_env = {}
-	for envfile in listdir("/etc/container_environment"):
-		name = os.path.basename(envfile)
-		with open("/etc/container_environment/" + envfile, "r") as f:
-			# Text files often end with a trailing newline, which we
-			# don't want to include in the env variable value. See
-			# https://github.com/phusion/baseimage-docker/pull/49
-			value = re.sub('\n\Z', '', f.read())
-		new_env[name] = value
-	if clear_existing_environment:
-		os.environ.clear()
-	for name, value in new_env.items():
-		if override_existing_environment or not name in os.environ:
-			os.environ[name] = value
-
-def export_envvars(to_dir = True):
-	shell_dump = ""
-	for name, value in os.environ.items():
-		if name in ['HOME', 'USER', 'GROUP', 'UID', 'GID', 'SHELL']:
-			continue
-		if to_dir:
-			with open("/etc/container_environment/" + name, "w") as f:
-				f.write(value)
-		shell_dump += "export " + shquote(name) + "=" + shquote(value) + "\n"
-	with open("/etc/container_environment.sh", "w") as f:
-		f.write(shell_dump)
-	with open("/etc/container_environment.json", "w") as f:
-		f.write(json.dumps(dict(os.environ)))
-
 _find_unsafe = re.compile(r'[^\w@%+=:,./-]').search
 
-def shquote(s):
-	"""Return a shell-escaped version of the string *s*."""
-	if not s:
-		return "''"
-	if _find_unsafe(s) is None:
-		return s
 
-	# use single quotes, and put single quotes into double quotes
-	# the string $'b is then quoted as '$'"'"'b'
-	return "'" + s.replace("'", "'\"'\"'") + "'"
+class AlarmException(Exception):
+    pass
+
+
+def error(message):
+    if log_level >= LOG_LEVEL_ERROR:
+        sys.stderr.write("*** %s\n" % message)
+
+
+def warn(message):
+    if log_level >= LOG_LEVEL_WARN:
+        sys.stderr.write("*** %s\n" % message)
+
+
+def info(message):
+    if log_level >= LOG_LEVEL_INFO:
+        sys.stderr.write("*** %s\n" % message)
+
+
+def debug(message):
+    if log_level >= LOG_LEVEL_DEBUG:
+        sys.stderr.write("*** %s\n" % message)
+
+
+def ignore_signals_and_raise_keyboard_interrupt(signame):
+    signal.signal(signal.SIGTERM, signal.SIG_IGN)
+    signal.signal(signal.SIGINT, signal.SIG_IGN)
+    raise KeyboardInterrupt(signame)
+
+
+def raise_alarm_exception():
+    raise AlarmException('Alarm')
+
+
+def listdir(path):
+    try:
+        result = os.stat(path)
+    except OSError:
+        return []
+    if stat.S_ISDIR(result.st_mode):
+        return sorted(os.listdir(path))
+    else:
+        return []
+
+
+def is_exe(path):
+    try:
+        return os.path.isfile(path) and os.access(path, os.X_OK)
+    except OSError:
+        return False
+
+
+def import_envvars(clear_existing_environment=True, override_existing_environment=True):
+    if not os.path.exists("/etc/container_environment"):
+        return
+    new_env = {}
+    for envfile in listdir("/etc/container_environment"):
+        name = os.path.basename(envfile)
+        with open("/etc/container_environment/" + envfile, "r") as f:
+            # Text files often end with a trailing newline, which we
+            # don't want to include in the env variable value. See
+            # https://github.com/phusion/baseimage-docker/pull/49
+            value = re.sub('\n\Z', '', f.read())
+        new_env[name] = value
+    if clear_existing_environment:
+        os.environ.clear()
+    for name, value in new_env.items():
+        if override_existing_environment or name not in os.environ:
+            os.environ[name] = value
+
+
+def export_envvars(to_dir=True):
+    if not os.path.exists("/etc/container_environment"):
+        return
+    shell_dump = ""
+    for name, value in os.environ.items():
+        if name in ['HOME', 'USER', 'GROUP', 'UID', 'GID', 'SHELL']:
+            continue
+        if to_dir:
+            with open("/etc/container_environment/" + name, "w") as f:
+                f.write(value)
+        shell_dump += "export " + sanitize_shenvname(name) + "=" + shquote(value) + "\n"
+    with open("/etc/container_environment.sh", "w") as f:
+        f.write(shell_dump)
+    with open("/etc/container_environment.json", "w") as f:
+        f.write(json.dumps(dict(os.environ)))
+
+
+def shquote(s):
+    """Return a shell-escaped version of the string *s*."""
+    if not s:
+        return "''"
+    if _find_unsafe(s) is None:
+        return s
+
+    # use single quotes, and put single quotes into double quotes
+    # the string $'b is then quoted as '$'"'"'b'
+    return "'" + s.replace("'", "'\"'\"'") + "'"
+
+
+def sanitize_shenvname(s):
+    """Return string with [0-9a-zA-Z_] characters"""
+    return re.sub(SHENV_NAME_WHITELIST_REGEX, "_", s)
+
 
 # Waits for the child process with the given PID, while at the same time
 # reaping any other child processes that have exited (e.g. adopted child
 # processes that have terminated).
+
 def waitpid_reap_other_children(pid):
-	global terminated_child_processes
+    global terminated_child_processes
 
-	status = terminated_child_processes.get(pid)
-	if status:
-		# A previous call to waitpid_reap_other_children(),
-		# with an argument not equal to the current argument,
-		# already waited for this process. Return the status
-		# that was obtained back then.
-		del terminated_child_processes[pid]
-		return status
+    status = terminated_child_processes.get(pid)
+    if status:
+        # A previous call to waitpid_reap_other_children(),
+        # with an argument not equal to the current argument,
+        # already waited for this process. Return the status
+        # that was obtained back then.
+        del terminated_child_processes[pid]
+        return status
 
-	done = False
-	status = None
-	while not done:
-		try:
-			this_pid, status = os.waitpid(-1, 0)
-			if this_pid == pid:
-				done = True
-			else:
-				# Save status for later.
-				terminated_child_processes[this_pid] = status
-		except OSError as e:
-			if e.errno == errno.ECHILD or e.errno == errno.ESRCH:
-				return None
-			else:
-				raise
-	return status
+    done = False
+    status = None
+    while not done:
+        try:
+            # https://github.com/phusion/baseimage-docker/issues/151#issuecomment-92660569
+            this_pid, status = os.waitpid(pid, os.WNOHANG)
+            if this_pid == 0:
+                this_pid, status = os.waitpid(-1, 0)
+            if this_pid == pid:
+                done = True
+            else:
+                # Save status for later.
+                terminated_child_processes[this_pid] = status
+        except OSError as e:
+            if e.errno == errno.ECHILD or e.errno == errno.ESRCH:
+                return None
+            else:
+                raise
+    return status
+
+
+def stop_child_process(name, pid, signo=signal.SIGTERM, time_limit=KILL_PROCESS_TIMEOUT):
+    info("Shutting down %s (PID %d)..." % (name, pid))
+    try:
+        os.kill(pid, signo)
+    except OSError:
+        pass
+    signal.alarm(time_limit)
+    try:
+        try:
+            waitpid_reap_other_children(pid)
+        except OSError:
+            pass
+    except AlarmException:
+        warn("%s (PID %d) did not shut down in time. Forcing it to exit." % (name, pid))
+        try:
+            os.kill(pid, signal.SIGKILL)
+        except OSError:
+            pass
+        try:
+            waitpid_reap_other_children(pid)
+        except OSError:
+            pass
+    finally:
+        signal.alarm(0)
 
-def stop_child_process(name, pid, signo = signal.SIGTERM, time_limit = KILL_PROCESS_TIMEOUT):
-	info("Shutting down %s (PID %d)..." % (name, pid))
-	try:
-		os.kill(pid, signo)
-	except OSError:
-		pass
-	signal.alarm(time_limit)
-	try:
-		try:
-			waitpid_reap_other_children(pid)
-		except OSError:
-			pass
-	except AlarmException:
-		warn("%s (PID %d) did not shut down in time. Forcing it to exit." % (name, pid))
-		try:
-			os.kill(pid, signal.SIGKILL)
-		except OSError:
-			pass
-		try:
-			waitpid_reap_other_children(pid)
-		except OSError:
-			pass
-	finally:
-		signal.alarm(0)
 
 def run_command_killable(*argv):
-	filename = argv[0]
-	status = None
-	pid = os.spawnvp(os.P_NOWAIT, filename, argv)
-	try:
-		status = waitpid_reap_other_children(pid)
-	except BaseException as s:
-		warn("An error occurred. Aborting.")
-		stop_child_process(filename, pid)
-		raise
-	if status != 0:
-		if status is None:
-			error("%s exited with unknown status\n" % filename)
-		else:
-			error("%s failed with status %d\n" % (filename, os.WEXITSTATUS(status)))
-		sys.exit(1)
+    filename = argv[0]
+    status = None
+    pid = os.spawnvp(os.P_NOWAIT, filename, argv)
+    try:
+        status = waitpid_reap_other_children(pid)
+    except BaseException:
+        warn("An error occurred. Aborting.")
+        stop_child_process(filename, pid)
+        raise
+    if status != 0:
+        if status is None:
+            error("%s exited with unknown status\n" % filename)
+        else:
+            error("%s failed with status %d\n" % (filename, os.WEXITSTATUS(status)))
+        sys.exit(1)
+
 
 def run_command_killable_and_import_envvars(*argv):
-	run_command_killable(*argv)
-	import_envvars()
-	export_envvars(False)
+    run_command_killable(*argv)
+    import_envvars()
+    export_envvars(False)
+
 
 def kill_all_processes(time_limit):
-	info("Killing all processes...")
-	try:
-		os.kill(-1, signal.SIGTERM)
-	except OSError:
-		pass
-	signal.alarm(time_limit)
-	try:
-		# Wait until no more child processes exist.
-		done = False
-		while not done:
-			try:
-				os.waitpid(-1, 0)
-			except OSError as e:
-				if e.errno == errno.ECHILD:
-					done = True
-				else:
-					raise
-	except AlarmException:
-		warn("Not all processes have exited in time. Forcing them to exit.")
-		try:
-			os.kill(-1, signal.SIGKILL)
-		except OSError:
-			pass
-	finally:
-		signal.alarm(0)
+    info("Killing all processes...")
+    try:
+        os.kill(-1, signal.SIGTERM)
+    except OSError:
+        pass
+    signal.alarm(time_limit)
+    try:
+        # Wait until no more child processes exist.
+        done = False
+        while not done:
+            try:
+                os.waitpid(-1, 0)
+            except OSError as e:
+                if e.errno == errno.ECHILD:
+                    done = True
+                else:
+                    raise
+    except AlarmException:
+        warn("Not all processes have exited in time. Forcing them to exit.")
+        try:
+            os.kill(-1, signal.SIGKILL)
+        except OSError:
+            pass
+    finally:
+        signal.alarm(0)
+
 
 def run_startup_files():
-	# Run /etc/my_init.d/*
-	for name in listdir("/etc/my_init.d"):
-		filename = "/etc/my_init.d/" + name
-		if is_exe(filename):
-			info("Running %s..." % filename)
-			run_command_killable_and_import_envvars(filename)
+    # 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)
+
+    # Run /etc/rc.local.
+    if is_exe("/etc/rc.local"):
+        info("Running /etc/rc.local...")
+        run_command_killable_and_import_envvars("/etc/rc.local")
+
+
+def run_pre_shutdown_scripts():
+    debug("Running pre-shutdown scripts...")
+
+    # Run /etc/my_init.pre_shutdown.d/*
+    for name in listdir("/etc/my_init.pre_shutdown.d"):
+        filename = "/etc/my_init.pre_shutdown.d/" + name
+        if is_exe(filename):
+            info("Running %s..." % filename)
+            run_command_killable(filename)
+
+
+def run_post_shutdown_scripts():
+    debug("Running post-shutdown scripts...")
+
+    # Run /etc/my_init.post_shutdown.d/*
+    for name in listdir("/etc/my_init.post_shutdown.d"):
+        filename = "/etc/my_init.post_shutdown.d/" + name
+        if is_exe(filename):
+            info("Running %s..." % filename)
+            run_command_killable(filename)
 
-	# Run /etc/rc.local.
-	if is_exe("/etc/rc.local"):
-		info("Running /etc/rc.local...")
-		run_command_killable_and_import_envvars("/etc/rc.local")
 
 def start_runit():
-	info("Booting runit daemon...")
-	pid = os.spawnl(os.P_NOWAIT, "/usr/bin/runsvdir", "/usr/bin/runsvdir",
-		"-P", "/etc/service")
-	info("Runit started as PID %d" % pid)
-	return pid
+    info("Booting runit daemon...")
+    pid = os.spawnl(os.P_NOWAIT, "/usr/bin/runsvdir", "/usr/bin/runsvdir",
+                    "-P", "/etc/service")
+    info("Runit started as PID %d" % pid)
+    return pid
+
 
 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):
+    if not quiet:
+        debug("Begin shutting down runit services...")
+    os.system("/usr/bin/sv -w %d force-stop /etc/service/* > /dev/null" % KILL_PROCESS_TIMEOUT)
 
-def shutdown_runit_services():
-	debug("Begin shutting down runit services...")
-	os.system("/usr/bin/sv down /etc/service/*")
 
 def wait_for_runit_services():
-	debug("Waiting for runit services to exit...")
-	done = False
-	while not done:
-		done = os.system("/usr/bin/sv status /etc/service/* | grep -q '^run:'") != 0
-		if not done:
-			time.sleep(0.1)
+    debug("Waiting for runit services to exit...")
+    done = False
+    while not done:
+        done = os.system("/usr/bin/sv status /etc/service/* | grep -q '^run:'") != 0
+        if not done:
+            time.sleep(0.1)
+            # According to https://github.com/phusion/baseimage-docker/issues/315
+            # there is a bug or race condition in Runit, causing it
+            # not to shutdown services that are already being started.
+            # So during shutdown we repeatedly instruct Runit to shutdown
+            # services.
+            shutdown_runit_services(True)
+
 
 def install_insecure_key():
-	info("Installing insecure SSH key for user root")
-	run_command_killable("/usr/sbin/enable_insecure_key")
+    info("Installing insecure SSH key for user root")
+    run_command_killable("/usr/sbin/enable_insecure_key")
+
 
 def main(args):
-	import_envvars(False, False)
-	export_envvars()
+    import_envvars(False, False)
+    export_envvars()
 
-	if args.enable_insecure_key:
-		install_insecure_key()
+    if args.enable_insecure_key:
+        install_insecure_key()
 
-	if not args.skip_startup_files:
-		run_startup_files()
+    if not args.skip_startup_files:
+        run_startup_files()
 
-	runit_exited = False
-	exit_code = None
+    runit_exited = False
+    exit_code = None
 
-	if not args.skip_runit:
-		runit_pid = start_runit()
-	try:
-		exit_status = None
-		if len(args.main_command) == 0:
-			runit_exited, exit_code = wait_for_runit_or_interrupt(runit_pid)
-			if runit_exited:
-				if exit_code is None:
-					info("Runit exited with unknown status")
-					exit_status = 1
-				else:
-					exit_status = os.WEXITSTATUS(exit_code)
-					info("Runit exited with status %d" % exit_status)
-		else:
-			info("Running %s..." % " ".join(args.main_command))
-			pid = os.spawnvp(os.P_NOWAIT, args.main_command[0], args.main_command)
-			try:
-				exit_code = waitpid_reap_other_children(pid)
-				if exit_code is None:
-					info("%s exited with unknown status." % args.main_command[0])
-					exit_status = 1
-				else:
-					exit_status = os.WEXITSTATUS(exit_code)
-					info("%s exited with status %d." % (args.main_command[0], exit_status))
-			except KeyboardInterrupt:
-				stop_child_process(args.main_command[0], pid)
-				raise
-			except BaseException as s:
-				warn("An error occurred. Aborting.")
-				stop_child_process(args.main_command[0], pid)
-				raise
-		sys.exit(exit_status)
-	finally:
-		if not args.skip_runit:
-			shutdown_runit_services()
-			if not runit_exited:
-				stop_child_process("runit daemon", runit_pid)
-			wait_for_runit_services()
+    if not args.skip_runit:
+        runit_pid = start_runit()
+    try:
+        exit_status = None
+        if len(args.main_command) == 0:
+            runit_exited, exit_code = wait_for_runit_or_interrupt(runit_pid)
+            if runit_exited:
+                if exit_code is None:
+                    info("Runit exited with unknown status")
+                    exit_status = 1
+                else:
+                    exit_status = os.WEXITSTATUS(exit_code)
+                    info("Runit exited with status %d" % exit_status)
+        else:
+            info("Running %s..." % " ".join(args.main_command))
+            pid = os.spawnvp(os.P_NOWAIT, args.main_command[0], args.main_command)
+            try:
+                exit_code = waitpid_reap_other_children(pid)
+                if exit_code is None:
+                    info("%s exited with unknown status." % args.main_command[0])
+                    exit_status = 1
+                else:
+                    exit_status = os.WEXITSTATUS(exit_code)
+                    info("%s exited with status %d." % (args.main_command[0], exit_status))
+            except KeyboardInterrupt:
+                stop_child_process(args.main_command[0], pid)
+                raise
+            except BaseException:
+                warn("An error occurred. Aborting.")
+                stop_child_process(args.main_command[0], pid)
+                raise
+        sys.exit(exit_status)
+    finally:
+        if not args.skip_runit:
+            run_pre_shutdown_scripts()
+            shutdown_runit_services()
+            if not runit_exited:
+                stop_child_process("runit daemon", runit_pid)
+            wait_for_runit_services()
+            run_post_shutdown_scripts()
 
 # Parse options.
-parser = argparse.ArgumentParser(description = 'Initialize the system.')
-parser.add_argument('main_command', metavar = 'MAIN_COMMAND', type = str, nargs = '*',
-	help = 'The main command to run. (default: runit)')
-parser.add_argument('--enable-insecure-key', dest = 'enable_insecure_key',
-	action = 'store_const', const = True, default = False,
-	help = 'Install the insecure SSH key')
-parser.add_argument('--skip-startup-files', dest = 'skip_startup_files',
-	action = 'store_const', const = True, default = False,
-	help = 'Skip running /etc/my_init.d/* and /etc/rc.local')
-parser.add_argument('--skip-runit', dest = 'skip_runit',
-	action = 'store_const', const = True, default = False,
-	help = 'Do not run runit services')
-parser.add_argument('--no-kill-all-on-exit', dest = 'kill_all_on_exit',
-	action = 'store_const', const = False, default = True,
-	help = 'Don\'t kill all processes on the system upon exiting')
-parser.add_argument('--quiet', dest = 'log_level',
-	action = 'store_const', const = LOG_LEVEL_WARN, default = LOG_LEVEL_INFO,
-	help = 'Only print warnings and errors')
+parser = argparse.ArgumentParser(description='Initialize the system.')
+parser.add_argument('main_command', metavar='MAIN_COMMAND', type=str, nargs='*',
+                    help='The main command to run. (default: runit)')
+parser.add_argument('--enable-insecure-key', dest='enable_insecure_key',
+                    action='store_const', const=True, default=False,
+                    help='Install the insecure SSH key')
+parser.add_argument('--skip-startup-files', dest='skip_startup_files',
+                    action='store_const', const=True, default=False,
+                    help='Skip running /etc/my_init.d/* and /etc/rc.local')
+parser.add_argument('--skip-runit', dest='skip_runit',
+                    action='store_const', const=True, default=False,
+                    help='Do not run runit services')
+parser.add_argument('--no-kill-all-on-exit', dest='kill_all_on_exit',
+                    action='store_const', const=False, default=True,
+                    help='Don\'t kill all processes on the system upon exiting')
+parser.add_argument('--quiet', dest='log_level',
+                    action='store_const', const=LOG_LEVEL_WARN, default=LOG_LEVEL_INFO,
+                    help='Only print warnings and errors')
 args = parser.parse_args()
 log_level = args.log_level
 
 if args.skip_runit and len(args.main_command) == 0:
-	error("When --skip-runit is given, you must also pass a main command.")
-	sys.exit(1)
+    error("When --skip-runit is given, you must also pass a main command.")
+    sys.exit(1)
 
 # Run main function.
 signal.signal(signal.SIGTERM, lambda signum, frame: ignore_signals_and_raise_keyboard_interrupt('SIGTERM'))
 signal.signal(signal.SIGINT, lambda signum, frame: ignore_signals_and_raise_keyboard_interrupt('SIGINT'))
 signal.signal(signal.SIGALRM, lambda signum, frame: raise_alarm_exception())
 try:
-	main(args)
+    main(args)
 except KeyboardInterrupt:
-	warn("Init system aborted.")
-	exit(2)
+    warn("Init system aborted.")
+    exit(2)
 finally:
-	if args.kill_all_on_exit:
-		kill_all_processes(KILL_ALL_PROCESSES_TIMEOUT)
+    if args.kill_all_on_exit:
+        kill_all_processes(KILL_ALL_PROCESSES_TIMEOUT)

image/bin/setuser

@@ -1,26 +1,65 @@
 #!/usr/bin/python3
-import sys, os, pwd
 
-if len(sys.argv) < 3:
-	sys.stderr.write("Usage: /sbin/setuser USERNAME COMMAND [args..]\n")
-	sys.exit(1)
+'''
+Copyright (c) 2013-2015 Phusion Holding B.V.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+'''
+
+import sys
+import os
+import pwd
+
 
 def abort(message):
-	sys.stderr.write("setuser: %s\n" % message)
-	sys.exit(1)
+    sys.stderr.write("setuser: %s\n" % message)
+    sys.exit(1)
+
+
+def main():
+    '''
+    A simple alternative to sudo that executes a command as a user by setting
+    the user ID and user parameters to those described by the system and then
+    using execvp(3) to execute the command without the necessity of a TTY
+    '''
+
+    username = sys.argv[1]
+    try:
+        user = pwd.getpwnam(username)
+    except KeyError:
+        abort("user %s not found" % username)
+    os.initgroups(username, user.pw_gid)
+    os.setgid(user.pw_gid)
+    os.setuid(user.pw_uid)
+    os.environ['USER'] = username
+    os.environ['HOME'] = user.pw_dir
+    os.environ['UID'] = str(user.pw_uid)
+    try:
+        os.execvp(sys.argv[2], sys.argv[2:])
+    except OSError as e:
+        abort("cannot execute %s: %s" % (sys.argv[2], str(e)))
+
+if __name__ == '__main__':
+
+    if len(sys.argv) < 3:
+        sys.stderr.write("Usage: /sbin/setuser USERNAME COMMAND [args..]\n")
+        sys.exit(1)
+
+    main()
 
-username = sys.argv[1]
-try:
-	user = pwd.getpwnam(username)
-except KeyError:
-	abort("user %s not found" % username)
-os.initgroups(username, user.pw_gid)
-os.setgid(user.pw_gid)
-os.setuid(user.pw_uid)
-os.environ['USER'] = username
-os.environ['HOME'] = user.pw_dir
-os.environ['UID']  = str(user.pw_uid)
-try:
-	os.execvp(sys.argv[2], sys.argv[2:])
-except OSError as e:
-	abort("cannot execute %s: %s" % (sys.argv[2], str(e)))

image/buildconfig

@@ -1,3 +1,9 @@
 export LC_ALL=C
 export DEBIAN_FRONTEND=noninteractive
 minimal_apt_get_install='apt-get install -y --no-install-recommends'
+
+# Default services
+# Set 1 to the service you want to disable
+export DISABLE_SYSLOG=${DISABLE_SYSLOG:-0}
+export DISABLE_SSH=${DISABLE_SSH:-0}
+export DISABLE_CRON=${DISABLE_CRON:-0}

image/cleanup.sh

@@ -1,12 +1,15 @@
 #!/bin/bash
 set -e
-source /build/buildconfig
+source /bd_build/buildconfig
 set -x
 
 apt-get clean
-rm -rf /build
+find /bd_build/ -not \( -name 'bd_build' -or -name 'buildconfig' -or -name 'cleanup.sh' \) -delete
 rm -rf /tmp/* /var/tmp/*
 rm -rf /var/lib/apt/lists/*
-rm -f /etc/dpkg/dpkg.cfg.d/02apt-speedup
+
+# clean up python bytecode
+find / -mount -name *.pyc -delete
+find / -mount -name *__pycache__* -delete
 
 rm -f /etc/ssh/ssh_host_*

image/prepare.sh

@@ -1,13 +1,8 @@
 #!/bin/bash
 set -e
-source /build/buildconfig
+source /bd_build/buildconfig
 set -x
 
-## Temporarily disable dpkg fsync to make building faster.
-if [[ ! -e /etc/dpkg/dpkg.cfg.d/docker-apt-speedup ]]; then
-	echo force-unsafe-io > /etc/dpkg/dpkg.cfg.d/docker-apt-speedup
-fi
-
 ## Prevent initramfs updates from trying to run grub and lilo.
 ## https://journal.paul.querna.org/articles/2013/10/15/docker-ubuntu-on-rackspace/
 ## http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=594189
@@ -15,7 +10,8 @@ export INITRD=no
 mkdir -p /etc/container_environment
 echo -n no > /etc/container_environment/INITRD
 
-## Enable Ubuntu Universe and Multiverse.
+## Enable Ubuntu Universe, Multiverse, and deb-src for main.
+sed -i 's/^#\s*\(deb.*main restricted\)$/\1/g' /etc/apt/sources.list
 sed -i 's/^#\s*\(deb.*universe\)$/\1/g' /etc/apt/sources.list
 sed -i 's/^#\s*\(deb.*multiverse\)$/\1/g' /etc/apt/sources.list
 apt-get update
@@ -32,6 +28,9 @@ ln -sf /bin/true /sbin/initctl
 dpkg-divert --local --rename --add /usr/bin/ischroot
 ln -sf /bin/true /usr/bin/ischroot
 
+# apt-utils fix for Ubuntu 16.04
+$minimal_apt_get_install apt-utils
+
 ## Install HTTPS support for APT.
 $minimal_apt_get_install apt-transport-https ca-certificates
 
@@ -39,11 +38,20 @@ $minimal_apt_get_install apt-transport-https ca-certificates
 $minimal_apt_get_install software-properties-common
 
 ## Upgrade all packages.
-apt-get dist-upgrade -y --no-install-recommends
+apt-get dist-upgrade -y --no-install-recommends -o Dpkg::Options::="--force-confold"
 
 ## Fix locale.
-$minimal_apt_get_install language-pack-en
-locale-gen en_US
-update-locale LANG=en_US.UTF-8 LC_CTYPE=en_US.UTF-8
-echo -n en_US.UTF-8 > /etc/container_environment/LANG
-echo -n en_US.UTF-8 > /etc/container_environment/LC_CTYPE
+case $(lsb_release -is) in
+  Ubuntu)
+    $minimal_apt_get_install language-pack-en language-pack-fr
+    ;;
+  Debian)
+    $minimal_apt_get_install locales locales-all
+    ;;
+  *)
+    ;;
+esac
+locale-gen fr_FR
+update-locale LANG=fr_FR.UTF-8 LC_CTYPE=fr_FR.UTF-8
+echo -n fr_FR.UTF-8 > /etc/container_environment/LANG
+echo -n fr_FR.UTF-8 > /etc/container_environment/LC_CTYPE

image/runit/cron

@@ -1,2 +0,0 @@
-#!/bin/sh
-exec /usr/sbin/cron -f

image/runit/syslog-forwarder

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

image/runit/syslog-ng

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

image/services/cron/cron.runit

@@ -0,0 +1,8 @@
+#!/bin/sh
+
+# Touch cron files to fix 'NUMBER OF HARD LINKS > 1' issue. See  https://github.com/phusion/baseimage-docker/issues/198
+touch -c /var/spool/cron/crontabs/*
+touch -c /etc/crontab
+touch -c /etc/cron.d/* /etc/cron.daily/* /etc/cron.hourly/* /etc/cron.monthly/* /etc/cron.weekly/*
+
+exec /usr/sbin/cron -f

image/services/cron/cron.sh

@@ -0,0 +1,19 @@
+#!/bin/bash
+set -e
+source /bd_build/buildconfig
+set -x
+
+$minimal_apt_get_install cron
+mkdir /etc/service/cron
+chmod 600 /etc/crontab
+cp /bd_build/services/cron/cron.runit /etc/service/cron/run
+# Fix cron issues in 0.9.19, see also #345: https://github.com/phusion/baseimage-docker/issues/345
+sed -i 's/^\s*session\s\+required\s\+pam_loginuid.so/# &/' /etc/pam.d/cron
+
+## Remove useless cron entries.
+# Checks for lost+found and scans for mtab.
+rm -f /etc/cron.daily/standard
+rm -f /etc/cron.daily/upstart
+rm -f /etc/cron.daily/dpkg
+rm -f /etc/cron.daily/password
+rm -f /etc/cron.weekly/fstrim

image/services/sshd/sshd.sh

@@ -0,0 +1,25 @@
+#!/bin/bash
+set -e
+source /bd_build/buildconfig
+set -x
+
+SSHD_BUILD_PATH=/bd_build/services/sshd
+
+## Install the SSH server.
+$minimal_apt_get_install openssh-server
+mkdir /var/run/sshd
+mkdir /etc/service/sshd
+touch /etc/service/sshd/down
+cp $SSHD_BUILD_PATH/sshd.runit /etc/service/sshd/run
+cp $SSHD_BUILD_PATH/sshd_config /etc/ssh/sshd_config
+cp $SSHD_BUILD_PATH/00_regen_ssh_host_keys.sh /etc/my_init.d/
+
+## Install default SSH key for root and app.
+mkdir -p /root/.ssh
+chmod 700 /root/.ssh
+chown root:root /root/.ssh
+cp $SSHD_BUILD_PATH/keys/insecure_key.pub /etc/insecure_key.pub
+cp $SSHD_BUILD_PATH/keys/insecure_key /etc/insecure_key
+chmod 644 /etc/insecure_key*
+chown root:root /etc/insecure_key*
+cp $SSHD_BUILD_PATH/enable_insecure_key /usr/sbin/

image/services/syslog-ng/logrotate.conf

@@ -0,0 +1,36 @@
+# see "man logrotate" for details
+# rotate log files weekly
+weekly
+
+# use the syslog group by default, since this is the owning group
+# of /var/log/syslog.
+# su root syslog
+
+# keep 4 weeks worth of backlogs
+rotate 4
+
+# create new (empty) log files after rotating old ones
+create
+
+# uncomment this if you want your log files compressed
+#compress
+
+# packages drop log rotation information into this directory
+include /etc/logrotate.d
+
+# no packages own wtmp, or btmp -- we'll rotate them here
+/var/log/wtmp {
+    missingok
+    monthly
+    create 0664 root utmp
+    rotate 1
+}
+
+/var/log/btmp {
+    missingok
+    monthly
+    create 0660 root utmp
+    rotate 1
+}
+
+# system-specific logs may be configured here

image/services/syslog-ng/logrotate_syslogng

@@ -1,5 +1,4 @@
-/var/log/syslog
-{
+/var/log/syslog {
 	rotate 7
 	daily
 	missingok
@@ -7,7 +6,9 @@
 	delaycompress
 	compress
 	postrotate
-		sv reload syslog-ng > /dev/null
+		if [ -f /var/run/syslog-ng.pid ]; then
+			kill -HUP `cat /var/run/syslog-ng.pid`
+		fi
 	endscript
 }
 
@@ -22,8 +23,7 @@
 /var/log/lpr.log
 /var/log/cron.log
 /var/log/debug
-/var/log/messages
-{
+/var/log/messages {
 	rotate 4
 	weekly
 	missingok
@@ -32,7 +32,8 @@
 	delaycompress
 	sharedscripts
 	postrotate
-		sv reload syslog-ng > /dev/null
-		sv restart cron-log-forwarder > /dev/null
+		if [ -f /var/run/syslog-ng.pid ]; then
+			kill -HUP `cat /var/run/syslog-ng.pid`
+		fi
 	endscript
 }

image/services/syslog-ng/syslog-ng.conf

@@ -0,0 +1,152 @@
+@version: 3.13
+@include "scl.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$");
+};
+
+########################
+# Sources
+########################
+# This is the default behavior of sysklogd package
+# Logs may come from unix stream, but not from another machine.
+#
+source s_src {
+       unix-dgram("/dev/log");
+       internal();
+};
+
+# If you wish to get logs from remote machine you should uncomment
+# this and comment the above source line.
+#
+#source s_net { tcp(ip(127.0.0.1) port(1000)); };
+
+########################
+# Destinations
+########################
+# First some standard logfile
+#
+destination d_auth { file("/var/log/auth.log"); };
+destination d_cron { file("/var/log/cron.log"); };
+destination d_daemon { file("/var/log/daemon.log"); };
+destination d_kern { file("/var/log/kern.log"); };
+destination d_lpr { file("/var/log/lpr.log"); };
+destination d_mail { file("/var/log/mail.log"); };
+destination d_syslog { file("/var/log/syslog"); };
+destination d_user { file("/var/log/user.log"); };
+destination d_uucp { file("/var/log/uucp.log"); };
+
+# This files are the log come from the mail subsystem.
+#
+destination d_mailinfo { file("/var/log/mail.info"); };
+destination d_mailwarn { file("/var/log/mail.warn"); };
+destination d_mailerr { file("/var/log/mail.err"); };
+
+# Logging for INN news system
+#
+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.
+#
+destination d_debug { file("/var/log/debug"); };
+destination d_error { file("/var/log/error"); };
+destination d_messages { file("/var/log/messages"); };
+
+# The named pipe /dev/xconsole is for the nsole' utility.  To use it,
+# you must invoke nsole' with the -file' option:
+#
+#    $ xconsole -file /dev/xconsole [...]
+#
+destination d_xconsole { pipe("/dev/xconsole"); };
+
+# Send the messages to an other host
+#
+#destination d_net { tcp("127.0.0.1" port(1000) log_fifo_size(1000)); };
+
+# Debian only
+destination d_ppp { file("/var/log/ppp.log"); };
+
+# stdout for docker
+destination d_stdout { ##SYSLOG_OUTPUT_MODE_DEV_STDOUT##("/dev/stdout"); };
+
+########################
+# Filters
+########################
+# Here's come the filter options. With this rules, we can set which
+# message go where.
+
+filter f_dbg { level(debug); };
+filter f_info { level(info); };
+filter f_notice { level(notice); };
+filter f_warn { level(warn); };
+filter f_err { level(err); };
+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
+                    not facility(auth,authpriv,cron,daemon,mail,news); };
+
+filter f_auth { facility(auth, authpriv) and not filter(f_debug); };
+filter f_cron { facility(cron) and not filter(f_debug); };
+filter f_daemon { facility(daemon) and not filter(f_debug); };
+filter f_kern { facility(kern) and not filter(f_debug); };
+filter f_lpr { facility(lpr) and not filter(f_debug); };
+filter f_local { facility(local0, local1, local3, local4, local5,
+                        local6, local7) and not filter(f_debug); };
+filter f_mail { facility(mail) and not filter(f_debug); };
+filter f_news { facility(news) and not filter(f_debug); };
+filter f_syslog3 { not facility(auth, authpriv, mail) and not filter(f_debug); };
+filter f_user { facility(user) and not filter(f_debug); };
+filter f_uucp { facility(uucp) and not filter(f_debug); };
+
+filter f_cnews { level(notice, err, crit) and facility(news); };
+filter f_cother { level(debug, info, notice, warn) or facility(daemon, mail); };
+
+filter f_ppp { facility(local2) and not filter(f_debug); };
+filter f_console { level(warn .. emerg); };
+
+########################
+# Log paths
+########################
+log { source(s_src); filter(f_auth); destination(d_auth); };
+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); destination(d_stdout); };
+log { source(s_src); filter(f_user); destination(d_user); };
+log { source(s_src); filter(f_uucp); destination(d_uucp); };
+
+log { source(s_src); filter(f_mail); destination(d_mail); };
+#log { source(s_src); filter(f_mail); filter(f_info); destination(d_mailinfo); };
+#log { source(s_src); filter(f_mail); filter(f_warn); destination(d_mailwarn); };
+#log { source(s_src); filter(f_mail); filter(f_err); destination(d_mailerr); };
+
+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); };
+
+log { source(s_src); filter(f_debug); destination(d_debug); };
+log { source(s_src); filter(f_error); destination(d_error); };
+log { source(s_src); filter(f_messages); destination(d_messages); };
+
+# All messages send to a remote site
+#
+#log { source(s_src); destination(d_net); };
+
+###
+# Include all config files in /etc/syslog-ng/conf.d/
+###
+@include "/etc/syslog-ng/conf.d/*.conf"

image/services/syslog-ng/syslog-ng.init

@@ -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 $?

image/services/syslog-ng/syslog-ng.sh

@@ -0,0 +1,21 @@
+#!/bin/bash
+set -e
+source /bd_build/buildconfig
+set -x
+
+SYSLOG_NG_BUILD_PATH=/bd_build/services/syslog-ng
+
+## Install a syslog daemon.
+$minimal_apt_get_install syslog-ng-core
+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 logrotate.
+$minimal_apt_get_install logrotate
+cp $SYSLOG_NG_BUILD_PATH/logrotate.conf /etc/logrotate.conf
+cp $SYSLOG_NG_BUILD_PATH/logrotate_syslogng /etc/logrotate.d/syslog-ng

image/services/syslog-ng/syslog-ng.shutdown

@@ -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 $?

image/system_services.sh

@@ -1,11 +1,13 @@
 #!/bin/bash
 set -e
-source /build/buildconfig
+source /bd_build/buildconfig
 set -x
 
 ## Install init process.
-cp /build/bin/my_init /sbin/
+cp /bd_build/bin/my_init /sbin/
 mkdir -p /etc/my_init.d
+mkdir -p /etc/my_init.pre_shutdown.d
+mkdir -p /etc/my_init.post_shutdown.d
 mkdir -p /etc/container_environment
 touch /etc/container_environment.sh
 touch /etc/container_environment.json
@@ -19,51 +21,11 @@ ln -s /etc/container_environment.sh /etc/profile.d/
 ## Install runit.
 $minimal_apt_get_install runit
 
-## Install a syslog daemon.
-$minimal_apt_get_install syslog-ng-core
-mkdir /etc/service/syslog-ng
-cp /build/runit/syslog-ng /etc/service/syslog-ng/run
-mkdir -p /var/lib/syslog-ng
-cp /build/config/syslog_ng_default /etc/default/syslog-ng
-touch /var/log/syslog
-chmod u=rw,g=r,o= /var/log/syslog
-# Replace the system() source because inside Docker we
-# can't access /proc/kmsg.
-sed -i -E 's/^(\s*)system\(\);/\1unix-stream("\/dev\/log");/' /etc/syslog-ng/syslog-ng.conf
-
-## Install syslog to "docker logs" forwarder.
-mkdir /etc/service/syslog-forwarder
-cp /build/runit/syslog-forwarder /etc/service/syslog-forwarder/run
-
-## Install logrotate.
-$minimal_apt_get_install logrotate
-cp /build/config/logrotate_syslogng /etc/logrotate.d/syslog-ng
+## Install a syslog daemon and logrotate.
+[ "$DISABLE_SYSLOG" -eq 0 ] && /bd_build/services/syslog-ng/syslog-ng.sh || true
 
 ## Install the SSH server.
-$minimal_apt_get_install openssh-server
-mkdir /var/run/sshd
-mkdir /etc/service/sshd
-touch /etc/service/sshd/down
-cp /build/runit/sshd /etc/service/sshd/run
-cp /build/config/sshd_config /etc/ssh/sshd_config
-cp /build/00_regen_ssh_host_keys.sh /etc/my_init.d/
-
-## Install default SSH key for root and app.
-mkdir -p /root/.ssh
-chmod 700 /root/.ssh
-chown root:root /root/.ssh
-cp /build/insecure_key.pub /etc/insecure_key.pub
-cp /build/insecure_key /etc/insecure_key
-chmod 644 /etc/insecure_key*
-chown root:root /etc/insecure_key*
-cp /build/bin/enable_insecure_key /usr/sbin/
+[ "$DISABLE_SSH" -eq 0 ] && /bd_build/services/sshd/sshd.sh || true
 
 ## Install cron daemon.
-$minimal_apt_get_install cron
-mkdir /etc/service/cron
-chmod 600 /etc/crontab
-cp /build/runit/cron /etc/service/cron/run
-
-## Remove useless cron entries.
-# Checks for lost+found and scans for mtab.
-rm -f /etc/cron.daily/standard
+[ "$DISABLE_CRON" -eq 0 ] && /bd_build/services/cron/cron.sh || true

image/utilities.sh

@@ -1,10 +1,14 @@
 #!/bin/bash
 set -e
-source /build/buildconfig
+source /bd_build/buildconfig
 set -x
 
 ## Often used tools.
-$minimal_apt_get_install curl less nano vim 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.
-cp /build/bin/setuser /sbin/setuser
+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

install-tools.sh

@@ -8,5 +8,5 @@ cp tools/docker-bash /usr/local/bin/
 cp tools/docker-ssh /usr/local/bin/
 cp tools/baseimage-docker-nsenter /usr/local/bin/
 mkdir -p /usr/local/share/baseimage-docker
-cp image/insecure_key /usr/local/share/baseimage-docker/
+cp image/services/sshd/keys/insecure_key /usr/local/share/baseimage-docker/
 chmod 644 /usr/local/share/baseimage-docker/insecure_key

test/runner.sh

@@ -14,29 +14,25 @@ function cleanup()
 	docker rm $ID >/dev/null
 }
 
-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 $NAME:$VERSION /sbin/my_init --enable-insecure-key`
 sleep 1
 
-echo " --> Obtaining IP"
-IP=`docker inspect $ID | grep IPAddress | sed -e 's/.*: "//; s/".*//'`
-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
 
 echo " --> Enabling SSH in the container"
-docker exec -t -i $ID /etc/my_init.d/00_regen_ssh_host_keys.sh -f
-docker exec -t -i $ID rm /etc/service/sshd/down
-docker exec -t -i $ID sv start /etc/service/sshd
+docker exec $ID /etc/my_init.d/00_regen_ssh_host_keys.sh -f
+docker exec $ID rm /etc/service/sshd/down
+docker exec $ID sv start /etc/service/sshd
 sleep 1
 
 echo " --> Logging into container and running tests"
-cp image/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 \
-	/bin/bash /test/test.sh
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
+tools/docker-ssh $ID bash < test/test.sh

tools/docker-ssh

@@ -40,8 +40,8 @@ if ! test -e ~/.baseimage_docker_insecure_key; then
 	else
 		dir=`dirname "$0"`
 		dir=`cd "$dir/.." && pwd`
-		if test -e "$dir/image/insecure_key"; then
-			cp "$dir/image/insecure_key" ~/.baseimage_docker_insecure_key
+		if test -e "$dir/image/services/sshd/keys/insecure_key"; then
+			cp "$dir/image/services/sshd/keys/insecure_key" ~/.baseimage_docker_insecure_key
 		else
 			echo "*** ERROR ***: Baseimage-docker insecure key not found." >&2
 			echo "You probably didn't install docker-ssh properly. Please reinstall it:" >&2
@@ -58,6 +58,13 @@ fi
 
 KNOWN_HOSTS_FILE=`mktemp /tmp/docker-ssh.XXXXXXXXX`
 IP=`docker inspect -f "{{ .NetworkSettings.IPAddress }}" "$CONTAINER_ID"`
+PORT=`docker inspect -f '{{(index (index .NetworkSettings.Ports "22/tcp") 0).HostPort}}' "$CONTAINER_ID"`
+if test "`uname`" = "Darwin"; then
+    IP="127.0.0.1"
+else
+    PORT=22
+fi
+echo "SSHing into $IP:$PORT"
 
 # Prevent SSH from warning about adding a host to the known_hosts file.
 ssh-keyscan "$IP" >"$KNOWN_HOSTS_FILE" 2>&1
@@ -68,6 +75,7 @@ if ! ssh -i ~/.baseimage_docker_insecure_key \
 	-o PasswordAuthentication=no \
 	-o KbdInteractiveAuthentication=no \
 	-o ChallengeResponseAuthentication=no \
+	-p $PORT \
 	"root@$IP" "$@"
 then
 	STATUS=$?