1
0
mirror of /repos/baseimage-docker.git synced 2025-12-30 08:01:31 +01:00

45 Commits

Author SHA1 Message Date
mpeterson
d3d4b6124a modified setuser to use Python3 (default on 14.04) 2014-05-12 10:21:54 +02:00
mpeterson
5cfdd42d4b Modify defaults for syslog_ng to function properly
On 14.04 (trusty) there is nos no need to list all the modules since that was fixed.
No only that, listing them causes an error and it doesn't start.
2014-05-12 10:21:54 +02:00
Kingdon Barrett
6acfd8794d Remove /dev/log if it's a file a file.
Fixes https://github.com/phusion/baseimage-docker/pull/25
2014-05-12 10:21:36 +02:00
Santiago M. Mola
90ff4682df Migrate to Python 3
Ubuntu Trusty ships Python 3 by default, but not Python 2. Older versions already ship Python 3, so this change should be safe.
2014-05-10 12:28:23 +00:00
Paul Jimenez
17f000b744 Upgrade from Precise to Trusty
Conflicts:
	image/sources.list
2014-05-10 12:26:34 +00:00
mpeterson
90262a0460 Better way to enable universe and multiverse
Instead of copying over a hardcoded file we just uncomment the correct lines via two simple sed commands.

Conflicts:
	image/sources.list
2014-05-10 12:24:41 +00:00
Stuart Campbell
5e2ee3838d Trim trailing newlines from file-based envs
Many editors add a trailing newline to files. This can result in
slightly unexpected values for environment variables read from
/etc/container_environment.
2014-04-03 00:13:09 +11:00
Hongli Lai (Phusion)
8f9eefa1f6
Correctly pass child process' exit status to sys.exit(). Closes GH-45 2014-03-28 10:23:25 +01:00
Hongli Lai (Phusion)
f55fde8d99
Fix a bug in the build process 2014-03-25 17:06:53 +01:00
Hongli Lai (Phusion)
0632b4865b Set the INITRD env variable and make 'ischroot' always return true.
This prevents initramfs and initscripts updates from breaking.
2014-03-25 16:44:33 +01:00
Hongli Lai (Phusion)
7914d8ac55 Enable more Ubuntu APT repositories. 2014-03-25 16:44:29 +01:00
Hongli Lai (Phusion)
73709ed0a0
During 'docker build', temporarily disable dpkg fsync to make it faster 2014-03-25 16:22:04 +01:00
Slawomir Chodnicki
585932c74c properly specify location of sftp-server binary
Currently there is a symlink at /usr/lib/sftp-server to /usr/lib/openssh/sftp-server in the image. That seems to give trouble with packages like the rssh restricted shell, which will not follow a symlink to the sftp server binary for security reasons. So currently it is not possible to use this image as a basis for scp/sftp only access over ssh.
2014-03-15 18:08:28 +01:00
Goffert van Gool
17cb4cebca typo fix 2014-03-06 02:54:37 +01:00
Hongli Lai (Phusion)
1684aa1448
Fix my_init not properly forcing Runit to shut down if Runit appears to refuse to respond to SIGTERM. 2014-02-25 22:49:34 +01:00
Hongli Lai (Phusion)
367cddb201
Fix a regression in my_init which causes it to delete environment variables passed from Docker. 2014-02-25 22:08:37 +01:00
Hongli Lai (Phusion)
4e60438c66
Fixed some warnings in 00_regen_ssh_host_keys.sh. 2014-02-25 15:18:28 +01:00
Hongli Lai (Phusion)
300adc0bf2
Store environment variables in a file, and allow init scripts to change environment variables.
Closes GH-23.
2014-02-25 12:47:02 +01:00
Hongli Lai (Phusion)
87698aa223
Added the logrotate service. Fixes GH-22. 2014-02-25 11:18:25 +01:00
Hongli Lai (Phusion)
68e4f5e8bf
Removed some default Ubuntu cron jobs which are not useful in Docker containers. 2014-02-25 11:16:09 +01:00
Hongli Lai (Phusion)
9af37c0d58
Fixed syslog-ng not being able to start because of a missing afsql module.
Closes pull request 7.
2014-02-25 11:07:54 +01:00
Hongli Lai (Phusion)
aa46e10163
Remove all EXPOSEd ports. Fixes GH-15. 2014-02-25 10:49:08 +01:00
Hongli Lai (Phusion)
139bc7b81e Merge branch 'feature/16' of https://github.com/thomasleveil/baseimage-docker into thomasleveil-feature/16 2014-02-25 10:30:30 +01:00
Hongli Lai
3d5a46482f Merge pull request #20 from thomasleveil/fix/failed-shutdown-msg
Fix failed shutdown message not displaying process name and PID
2014-02-24 13:23:04 +01:00
Thomas LÉVEIL
55efefa51b fix log not showing messages sent to stdout by my_init 2014-02-22 17:16:55 +01:00
Thomas LÉVEIL
1443856c34 fix failed shutdown message not displaying process name and PID 2014-02-22 16:36:41 +01:00
Thomas LÉVEIL
bf35ff2bf1 allow to install the insecure key with the new --enable-insecure-key option
fix #16
2014-02-22 16:30:08 +01:00
Thomas LÉVEIL
7bd55402b0 do not remove already installed private keys when installing the secure key 2014-02-22 14:26:48 +01:00
Thomas LÉVEIL
02c42206ec Create insecure_key.ppk
as a convenience for PuTTY/WinSCP users
2014-02-21 01:07:52 +01:00
Hongli Lai (Phusion)
d8968d136a Improve setuser: set auxilliary groups and more environment variables 2014-02-15 12:42:31 +01:00
Hongli Lai (Phusion)
b6dac86e04 Improve the init system: support skipping startup files and running a custom main command 2014-02-15 12:11:48 +01:00
Hongli Lai (Phusion)
c22f8804ad Correctly reap child processes that are adopted during invocation of init scripts. 2014-02-13 15:37:32 +01:00
Hongli Lai (Phusion)
37cd856425 Disable the insecure SSH key by default 2014-02-06 13:40:27 +01:00
Hongli Lai (Phusion)
a5f521b1b1
Change the name inside the insecure key 2014-02-06 13:06:40 +01:00
Matt Olson
892dcc7ca4 Bypass runsvdir-start in order to preserve env
runsvdir-start clears the environment, which wipes out any
environment variables passed in when the container starts.
This patch bypasses runsvdir-start and calls runsvdir directly,
preserving the current environment.
2014-02-05 11:52:48 -08:00
Hongli Lai (Phusion)
6786e7350d
Fixed syslog-ng startup problem 2014-02-03 17:03:39 +01:00
Hongli Lai (Phusion)
d2d1f713a4
Add forgotten file 2014-01-31 19:29:50 +01:00
Hongli Lai (Phusion)
abf75875a9
Do not save SSH host key in baseimage-docker. Instead, generate it automatically during boot. 2014-01-31 16:02:01 +01:00
Hongli Lai (Phusion)
62859010cb
Allow running scripts during startup. 2014-01-31 15:44:50 +01:00
Hongli Lai (Phusion)
2ac41ee8ab Fix compatibility with latest Ubuntu 12.04 base image. 2014-01-31 15:08:27 +01:00
Joris van de Donk
0bcc88828e Fixed SFTP not working
sftp-server isn't located under `/usr/libexec/` (the directory doesn't exist). It's instead located at `/usr/lib/sftp-server`
2013-12-06 13:32:57 +01:00
Hongli Lai (Phusion)
99306bcfcd
Correctly handle Docker shutdown.
When a container is stopped with 'docker stop', SIGTERM is sent to the
init process. Unfortunately neither bash nor runit-init handle that correctly,
so we write our own init system in Python that also waits for all services to
shutdown.
2013-11-12 22:36:55 +01:00
Hongli Lai (Phusion)
16ccc1e40d
Enable cron 2013-11-12 12:34:40 +01:00
Hongli Lai (Phusion)
aee8c8368f
Fix bugs, added README 2013-11-12 11:45:39 +01:00
Hongli Lai (Phusion)
9661f84da9
Initial commit 2013-11-12 11:39:25 +01:00