Docker/baseimage-docker
1
0
Fork 1
mirror of https://github.com/phusion/baseimage-docker.git synced 2026-03-26 12:29:07 +00:00
Code Issues Releases Wiki Activity
354 Commits 4 Branches 43 Tags
00034a9965a3e802b79d15cc6417945f7afe7b4f
Commit Graph

117 Commits

Author SHA1 Message Date
Travis Rowland
f7bba93be3 Preserve /build/{cleanup.sh,buildconfig} files. See #188 2017-03-21 03:37:00 -07:00
Travis Rowland
6216f70411 Revert "Merge branch 'i386' into next" 
This reverts commit 34408d8013, reversing
changes made to 5d80f284b0.
 2017-03-21 03:15:25 -07:00
Travis Rowland
34408d8013 Merge branch 'i386' into next 2017-03-21 03:06:29 -07:00
Travis Rowland
f9838ccce0 Revert "Preserve /build/{cleanup.sh,buildconfig} files." 2017-03-21 02:41:20 -07:00
Kingdon Barrett
9fed983d80 services/cron sshd syslog-ng are all directories 
rm -f balks at wiping them out
 2017-03-21 03:17:24 +00:00
Kingdon Barrett
2a9860b120 packages don't exist and aren't build deps on i386 2017-03-21 03:07:34 +00:00
Kingdon Barrett
a09aae6dba fix libgc bug for i386 baseimage-docker 2017-03-21 02:40:54 +00:00
Enderson Maia
e019d5fa11 Preserve /build/{cleanup.sh,buildconfig} files. 
These files are useful for those who create Docker images based on this
baseimage, and need to make a final cleanup and/or use some
configurations that are inside buildconfig file.
 2017-03-20 09:35:54 -03:00
Travis Rowland
d9e762730a cleaning up getter/setter for KILL_PROCESS_TIMEOUT/KILL_ALL_PROCESSES_TIMEOUT 2017-03-19 16:17:52 -07:00
Travis Rowland
7ec5a0a65f Merge branch 'master' of https://github.com/pavlobaron/baseimage-docker into pavlobaron-master 2017-03-19 16:15:04 -07:00
Travis Rowland
15e27eefe6 Merge pull request #363 from lukecampbell/setuser 
Cleanup and improves readability of setuser
 2017-03-19 01:32:30 -07:00
Travis Rowland
1811cb7530 Merge pull request #348 from milinnovations/fix_cron_pam 
Provided a fix for cron not working out of the box.
 2017-03-19 01:20:24 -07:00
Travis Rowland
fdda2d42bf Merge pull request #339 from zhouhaibing089/logrotate-fix 
override the logrotate.conf without `su root syslog` Fixes #338
 2017-03-19 01:07:02 -07:00
Travis Rowland
4e5a7e91ce Merge pull request #336 from axilleas/fix-locales 
Reconfigure locales and expose them in Dockerfile
 2017-03-19 01:04:14 -07:00
Travis Rowland
241c41e093 Merge pull request #203 from UnrealQuester/copy 
Use COPY instead of ADD
 2017-03-19 00:21:29 -07:00
Luke Campbell
ffb22ecf60 Cleanup and improves readability of setuser 2017-02-24 12:03:53 -05:00
Matěj Týč
ac1211b0ed Provided a fix for cron not working out of the box. 2016-11-15 16:41:47 +01:00
Achilleas Pipinellis
bb3fef5377 Expose the locales in Dockerfile 
While the locales are generated with locale-gen, this does not enforce
the en_US.UTF-8 locale inside the container.

See the following links for more information:

- https://github.com/docker/docker/issues/2424
- http://jaredmarkell.com/docker-and-locales/
 2016-09-12 09:49:24 +02:00
zhouhaibing089
d3eceae5ef override the logrotate.conf without su root syslog 2016-09-12 10:49:28 +08:00
Hongli Lai (Phusion)
9001796aa8 Upon rotating /var/log/syslog, restart syslog-forwarder 2016-07-08 20:20:25 +02:00
Ernestas Lukoševičius
50db81d8be Fix incorrect runit service name for syslog tail 
Closes GH-292.
 2016-07-08 20:16:33 +02:00
Hongli Lai (Phusion)
82862ec7f7 Do not set the APT force-unsafe-io flag 
Docker already does this for us. Closes GH-265.
 2016-07-08 20:09:24 +02:00
Hongli Lai (Phusion)
3edd5d1564 Fixes a problem in PAM which may cause chpasswd and related tools to fail 
This is caused by Docker bug 6345 which is already closed, but for some
reason the problem still persists. Closes GH-181. Patch contributed
by Michael Zedeler.
 2016-07-08 20:00:02 +02:00
Hongli Lai (Phusion)
6d5518974f Fix typo in my_init 2016-07-08 18:50:44 +02:00
Hongli Lai (Phusion)
c93a14391a During shutdown, repeatedly tell Runit to shutdown services 
Works around a potential race condition in Runit itself.
Closes GH-315. Thanks to Chris Kite for submitting this patch.
 2016-07-08 18:37:03 +02:00
Pierre Jacomet
e436d1c4af Changes to upgrade this to Ubuntu-16.04 2016-04-28 19:10:08 -07:00
pavlobaron
ea6b0ace79 configure process kill timeouts through environment with fallbacks 2016-01-22 09:49:48 +01:00
Alexander Buddenbrock
17eadef537 Use COPY instead of ADD 
While COPY and ADD are essentially interchangeable here, it is still
considered good practice to use COPY whenever possible. From the docker
docks on best practices:

"Although ADD and COPY are functionally similar, generally speaking,
COPY is preferred. That’s because it’s more transparent than ADD.
[...] For other items (files, directories) that do not require ADD’s tar
auto-extraction capability, you should always use COPY."

Additionally, ADD commands were not cached prior to 0.7.3 (which was
released on 2013-01-02).
 2015-12-14 21:34:23 +01: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
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