40n8.me/baseimage-docker
1
0
Fork 0
mirror of /repos/baseimage-docker.git synced 2025-12-31 08:11:29 +01:00
Code Issues Releases Wiki Activity
228 Commits 3 Branches 0 Tags
Commit Graph

76 Commits

Author SHA1 Message Date
Hongli Lai (Phusion)
6e55e3d515
Redirect syslog to 'docker logs' and fix cron 
Closes GH-123. Closes GH-115.
 2015-01-19 18:07:15 +01:00
Hongli Lai (Phusion)
0b2de757f5 Fixed some locale issues 
Closes GH-178. Thanks to David J. M. Karlsen.
 2015-01-19 17:32:05 +01:00
Hongli Lai (Phusion)
9b08ea9cd4
Logrotate now reloads syslog-ng properly 
Closes GH-167.
 2015-01-19 16:55:09 +01:00
Hongli Lai (Phusion)
2640bc7b03 Make 'docker exec' the default and disable SSH by default 
Closes GH-168.
 2015-01-19 16:40:17 +01:00
Hongli Lai (Phusion)
8f2877c806
Do not set APT's force-unsafe-io option because the latest ubuntu image already does that 2015-01-17 14:32:41 +01:00
Hongli Lai (Phusion)
19c2df66b3 Remove workaround for Docker bug #2267 now that Docker has fixed this 
Closes GH-155.
 2015-01-16 16:50:39 +01:00
Kingdon Barrett
212e080b58 syslog-ng.ctl left around after commit 
For phusion/baseimage#128
 2014-08-07 15:15:07 -04:00
Hongli Lai (Phusion)
0de8640bac
Change the docker_env group ID from 1000 to 8377. 2014-07-25 14:49:06 +02:00
Hongli Lai (Phusion)
9be2ee2916
Fix my_init not properly exiting with a non-zero exit status when Ctrl-C is pressed. 2014-07-25 14:37:03 +02:00
Hongli Lai
5106ffd4b1 Merge pull request #105 from bubenkoff/patch-1 
Allow X11 forwarding and remove invalid xauth location
 2014-07-13 23:58:19 +02:00
Hongli Lai (Phusion)
1f38e2226e Added a workaround for Docker's inability to modify /etc/hosts in the container. 
See Docker bug 2267: https://github.com/dotcloud/docker/issues/2267
 2014-07-13 00:49:05 +02:00
Hongli Lai (Phusion)
75902437c9 Move scripts into bin directory 2014-07-13 00:49:04 +02:00
mephi42
669435158f my_init: use stderr for all logs 
Useful when you want to run tar within the container
and pipe the archive to host.
 2014-07-02 19:12:42 -04:00
Anatoly Bubenkov
a32cbb7808 remove explicit xauth location 
Change allows to connect by ssh using X11 forwarding from linux host, otherwise you get
debug1: Remote: No xauth program; cannot forward with spoofing.
 2014-07-02 16:04:37 +02:00
Hongli Lai
d0e63da07b Merge pull request #86 from imanel/patch-2 
Don't write HOME env variable
 2014-06-20 13:45:36 +02:00
Bernard Potocki
2beb0e253e Change break to continue 2014-06-20 12:38:17 +02:00
Hongli Lai
7ac6795aa5 Merge pull request #84 from imanel/patch-1 
Preserve ENV variables for SSH client
 2014-06-20 11:28:27 +02:00
Paul Annesley
3019bbf09b my_init: runsvdir no longer redirects stderr to proctitle. 
As described at http://smarden.org/runit/runsvdir.8.html passing a log
option to runsvdir causes stderr to be redirected to the proctitle.

That prevents stderr from reaching docker logs, which is a big problem.
 2014-06-18 09:38:52 -07:00
Bernard Potocki
18a7fe26ec Add USER, GROUP, UID, GID and SHELL to restricted env variables 2014-06-18 17:29:02 +02:00
Bernard Potocki
1357e9399e Add docker_env group and make container_environment scripts group-readable 2014-06-18 17:10:35 +02:00
Hongli Lai (Phusion)
5806f51ea3
Fixed various process waiting issues in my_init. 
Closes GH-27. Closes GH-82. Closes GH-83.
Thanks to André Luiz dos Santos and Paul Annesley.
 2014-06-17 14:35:05 +02:00
Hongli Lai
76100b639a Merge pull request #88 from jeckhart/fix-syslogng-runit-run 
Missing target of chown in syslog-ng runit run file
 2014-06-17 13:15:20 +02:00
Hongli Lai (Phusion)
92c2ea22ed Install add-apt-repository. 
Closes GH-74.
 2014-06-17 12:46:14 +02:00
John Eckhart
2b339a3344 Missing target of chown 2014-06-04 02:10:00 -04:00
Bernard Potocki
b665b78454 Make container_envoriments.sh and .json readable by other users 
Prevents bug when loading env variables on non-root user login.
 2014-06-02 15:06:02 +02:00
Bernard Potocki
5b403fe06c Don't write HOME env variable 
Loading HOME variable breaks multi-user container (i.e. logging as postgres user) if you try to load variables via `/etc/container_environment.sh`.
 2014-06-02 15:03:49 +02:00
Bernard Potocki
1a6c43b8d7 Preserve ENV variables for SSH client 
Currently when you ssh to host you will not see ENV variables set. This was mentioned earlier in #54 and solution is tested.

Additional rationale: currently you can't see docker link ENV variables inside ssh, so you need to load this file every time you connect to container. I would say that expected behavior is to preserve them in services that are provided at default (cron/ssh)
 2014-06-02 00:11:24 +02:00
Hongli Lai (Phusion)
22c3d60d94
Install ca-certificates package 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.
 2014-05-12 23:07:17 +02:00
Hongli Lai (Phusion)
b56693beb3
Fix syslog-ng. 
The system() source in the default syslog-ng config file does
not work in Docker because it tries to access /proc/kmsg,
which is not allowed due to Docker's privileges. We replace
it by a source that only reads from /dev/log.
 2014-05-12 17:29:45 +02:00
Hongli Lai (Phusion)
612b1504af
The syslog-ng script should restore /dev/xconsole permissions because that's what the official init script does 2014-05-12 16:43:55 +02:00
Hongli Lai (Phusion)
af11b5e7b4 Early in the my_init initialization process, do not overwrite already-defined environment variables by the ones in /etc/container_environment. 
Closes GH-52.
 2014-05-12 16:14:47 +02:00
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