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

92 Commits

Author SHA1 Message Date
Aiko Mastboom
f279a80a2c Merge tag 'rel-0.9.18' into rasberrypi-0.9.18 2016-04-26 12:37:12 +02:00
Enderson Maia
e053f04cf6 Fixed bug introduced in PR-182 
If you disable the installation of all services, you could have a != 0
output, and break the `docker build` process.
 2015-07-15 17:31:01 -03:00
Enderson Maia
9adbd423d0 Made services installation optional during build 
You can user `ENV` directive in Dockerfile to disable the installation
for some services or change `image/buildconfig`.

The flags are :

DISABLE_SSHD
DISABLE_CRON
DISABLE_SYSLOG
 2015-07-15 15:03:33 -03:00
Hongli Lai (Phusion)
7425da2825
Fix a potential hang in my_init during shutdown 
Thanks to SAPikachu. Closes GH-151.
 2015-07-15 17:35:45 +02:00
Hongli Lai (Phusion)
a9e956d9f9
syslog-ng: do not forward messages to /dev/tty10 
Closes GH-222.
 2015-07-15 15:27:03 +02:00
Hongli Lai (Phusion)
43af4a393e
my_init container_environment.sh: ensure that environment variable names don't include characters unsupported by Bash 
Closes GH-230.
 2015-07-15 15:12:18 +02:00
Hongli Lai (Phusion)
b72ef2eba3
Remove nano, replace VIM with vim-tiny 
This reduces the virtual size by 42 MB.
 2015-07-15 15:02:13 +02:00
Hongli Lai (Phusion)
404832ba47
Remove some unnecessary cron jobs 
Closes GH-205.
 2015-07-15 14:52:41 +02:00
Hongli Lai (Phusion)
f57320388c
Get rid of default HOME environment variable 
Closes GH-231.
 2015-07-15 14:36:10 +02:00
Hongli Lai (Phusion)
e575443aba
my_init: do not use /etc/container_environment if directory doesn't exist 2015-07-15 14:33:15 +02:00
Hongli Lai (Phusion)
9e65ebfbdc
Rename /build to /bd_build for fewer AUFS layer collissions 2015-07-15 14:28:55 +02:00
Aiko Mastboom
bc7f045318 just python.. 2015-05-09 20:08:39 +02:00
Aiko Mastboom
bb446e00ce changed FROM 2015-05-09 17:03:28 +02:00
Sergey Shepelev
eb23de21d9 syslog-forwarder continue after logrotate 
tail -F to continue reading new /var/log/syslog
 2015-02-20 00:44:38 +03:00
Hongli Lai (Phusion)
4a41a00697 Merge branch 'reduce-dockerfile-steps' of git://github.com/kanzure/baseimage-docker into kanzure-reduce-dockerfile-steps 2015-01-20 11:04:49 +01:00
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
Bryan Bishop
81af926a78 remove Dockerfile step for mkdir /build 
The ADD command will create /build automatically, so the RUN mkdir step
can be safely removed. Also, this has the benefit of reducing the number
of steps in the Dockerfile which is helpful for not as quickly hitting
the 127 layer limit.
 2014-11-24 10:56:23 -06: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