Fix setuid bit on /usr/bin/sudo, bump version to 0.9.15.

Closes GH-148.

Changelog.md

@@ -1,4 +1,20 @@
-## 0.9.12 (not yet released)
+## 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.

Makefile

@@ -1,5 +1,5 @@
 NAME = phusion/baseimage
-VERSION = 0.9.12
+VERSION = 0.9.15
 
 .PHONY: all build test tag_latest release ssh
 
@@ -16,6 +16,7 @@ tag_latest:
 
 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
 	docker push $(NAME)
 	@echo "*** Don't forget to create a tag. git tag rel-$(VERSION) && git push origin rel-$(VERSION)"
 

README.md

@@ -106,7 +106,7 @@ To look around in the image, run:
 
     docker run --rm -t -i phusion/baseimage:<VERSION> /sbin/my_init -- bash -l
 
-where `<VERSION>` is [one of the baseimage-docker version numbers](https://github.com/phusion/baseimage-docker/blob/nsenter/Changelog.md).
+where `<VERSION>` is [one of the baseimage-docker version numbers](https://github.com/phusion/baseimage-docker/blob/master/Changelog.md).
 
 You don't have to download anything manually. The above command will automatically pull the baseimage-docker image from the Docker registry.
 
@@ -147,7 +147,7 @@ You can add additional daemons (e.g. your own app) to the image by creating runi
 
 The shell script must be called `run`, must be executable, and is to be placed in the directory `/etc/service/<NAME>`.
 
-Here's an example showing you how a memached server runit entry can be made.
+Here's an example showing you how a memcached server runit entry can be made.
 
     ### In memcached.sh (make sure this file is chmod +x):
     #!/bin/sh

image/bin/my_init

@@ -291,6 +291,7 @@ def main(args):
 					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)

image/runit/syslog-ng

@@ -5,6 +5,7 @@ set -e
 # 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=""
 

image/system_services.sh

@@ -11,7 +11,7 @@ touch /etc/container_environment.sh
 touch /etc/container_environment.json
 chmod 700 /etc/container_environment
 
-groupadd docker_env
+groupadd -g 8377 docker_env
 chown :docker_env /etc/container_environment.sh /etc/container_environment.json
 chmod 640 /etc/container_environment.sh /etc/container_environment.json
 ln -s /etc/container_environment.sh /etc/profile.d/