Iwan/baseimage-docker_fr
1
0
Fork 0
forked from Docker/baseimage-docker
Code Issues Pull Requests Releases Wiki Activity
452 Commits 5 Branches 0 Tags
14896d9181125490ab410612e9ca031a7aff5467
Commit Graph

151 Commits

Author SHA1 Message Date
Travis Rowland
90e411fec2 Merge branch 'master' into Theaxiom-patch-1 2017-11-23 15:13:09 -08:00
Travis Rowland
5ab2367f76 Merge branch 'master' into sigint-logging 2017-11-23 12:28:39 -08:00
Ryan Sundberg
b77633463f Fork syslog-ng into a new process group via bash monitor mode 
This prevents SIGINT from a user interrupt from prematurely quitting syslog-ng.
See https://github.com/phusion/baseimage-docker/issues/450
 2017-11-22 23:18:19 -08:00
Steve Kamerman
25d13ef2b8 Gracefully handle syslog-ng shutdown 2017-11-01 17:26:31 -04:00
Ryan Sundberg
18a10580e1 Syslog-ng start and stop, preserving stdout file descriptor 2017-10-31 15:41:59 -07:00
Ryan Sundberg
d765626688 Prefix syslog-ng shutdown scripts with boot order 2017-10-31 14:24:18 -07:00
Travis Rowland
7c7ab1a0a6 my_init exits with 0 on SIGINT after runit is started 
fixes #358
 2017-10-30 12:04:21 -07:00
Travis Rowland
b05616332a Merge branch 'master' into syslog-shutdown 2017-10-30 11:59:01 -07:00
Steve Kamerman
421ca4ea05 Renamed install_clean 2017-10-30 10:22:42 -04:00
Steve Kamerman
c41f837f82 Added --no-install-recommends by default 2017-10-30 10:22:42 -04:00
Steve Kamerman
fcc1283c85 Added install_clean.sh utility 2017-10-30 10:22:42 -04:00
David Hiendl
2bb9d89325 configured syslog-ng to log to stdout directly instead of using tail (#438) 2017-10-05 21:13:01 +02:00
Ryan Sundberg
91363dcf37 Merge branch 'master' of https://github.com/phusion/baseimage-docker into syslog-shutdown 2017-09-28 11:26:45 -07:00
Travis Rowland
1a235a13e1 Update my_init 2017-07-31 21:49:57 -04:00
Jose Diaz-Gonzalez
0e15f28fb7 feat: allow users to specify an alternative init directory 
In some existing environments, packages might already use another environment for the purpose this `/etc/my_init.d` directory serves.
 2017-07-31 21:49:57 -04:00
Zsolt Ero
d6702be8c3 fix_pam_bug removed (#431) 2017-08-01 01:35:38 +02:00
Przemysław Dąbek
40bad74956 sanitize_shenvname returns string with [0-9a-zA-Z_] characters (#423) 
* sanitize_shenvname returns string with [0-9a-zA-Z_] characters

* moved regex pattern to constant
 2017-07-31 15:38:33 +02:00
Ryan Sundberg
a6bf447f9e Start syslog-ng before runit, and stop after runit. 
When syslog-ng is managed as an runit service, application logs may be
lost during shutdown, when the syslog-ng service stops before the app
exits.

This change uses the my_init.d directory to manage syslog-ng at a lower
runlevel than runit.
 2017-07-01 15:08:08 -07:00
Matthew Baggett
a3faefd3d3 Remove 3 unnecessary layers from the layer count. 2017-05-18 13:59:29 +01:00
Zsolt Ero
068b4534d4 prepare pre and post shudown.d folders (#407) 2017-05-11 17:13:49 +02:00
Zsolt Ero
2a8c9ebe38 apt-get fixes (#406) 
* apt-fixes

* DEBIAN_FRONTEND teletype at the end
 2017-05-09 11:39:43 +02:00
Zsolt Ero
7f77348a6b pre and post shutdown scripts added (#402) 2017-05-09 10:50:59 +02:00
Zsolt Ero
9f998e1a09 more pep8 linting (#400) 2017-05-09 09:52:48 +02:00
Jose Diaz-Gonzalez
7022d31858 chore: remove all E501 updates 2017-05-08 17:41:25 -06:00
Jose Diaz-Gonzalez
263b582139 feat: add newline and enforce file encoding 2017-05-08 17:23:07 -06:00
Jose Diaz-Gonzalez
f7dfb05850 refactor: improve pep8 compliance 
This changeset fixes PEP8 issues, minus `E501 line too long (80 > 79 characters)`, as that should be more of a guideline than a strict rule, and harder to follow without silly refactoring.

Also removed two unused exception variables.
 2017-05-08 17:07:48 -06:00
Xiangmin Jiao
b2c329af51 Suppress the status reports from "sv -w" 2017-04-22 20:46:36 -04:00
Kingdon Barrett
d3af157387 fixes the build 
pam sources are missing (they were in main)
 2017-04-19 20:11:06 -04:00
Tom Granqvist
06b065782d Fixing bug in my_init.shutdown_runit_services 
The os.system() call received two arguments from a typo with string formatting.
 2017-04-13 11:05:39 +03:00
Anshul Sharma
ac382d47b8 down wait for 7 secs this will fix it. 2017-04-11 08:07:32 +05:30
James Ravn
a5469e5572 Cast KILL*TIMEOUTS to int 
As int is required by signal.alarm.
 2017-04-07 11:36:31 +01:00
Travis Rowland
48d3f310ad Merge pull request #382 from lucafavatella/syslog-ng-system 
Correct translation of syslog-ng driver `system()` on Docker
 2017-03-23 12:04:57 -07:00
Luca Favatella
45facca75e Correct translation of syslog-ng driver system() on Docker 
According to [the stock Ubuntu 16.04
config](https://github.com/hyperknot/baseimage16/blob/1.0.1/image/services/syslog-ng/syslog-ng.conf.original#L21),
the default source driver is `system()`, that is documented in [the
syslog-ng 3.5 official
documentation](https://www.balabit.com/documents/syslog-ng-ose-3.5-guides/en/syslog-ng-ose-guide-admin/html-single/index.html#configuring-source-system)
on Linux as `unix-dgram("/dev/log");` with some `/proc/kmsg`
involvement if kernel "is version 3.5 or newer".

`/proc/kmsg` causes trouble on Docker hence using syslog-ng 3.5 on
Docker `unix-dgram("/dev/log")` shall be used (not
`unix-stream("/dev/log");`).

If using syslog-ng
[3.6](https://www.balabit.com/documents/syslog-ng-ose-3.6-guides/en/syslog-ng-ose-guide-admin/html-single/index.html#configuring-source-system)
or
[newer](https://www.balabit.com/documents/syslog-ng-ose-3.9-guides/en/syslog-ng-ose-guide-admin/html-single/index.html#configuring-source-system)
on Docker, `system()` shall be able to be used.  But [Ubuntu 16.04 is
at syslog-ng 3.5](http://packages.ubuntu.com/xenial/syslog-ng-core) so
`system()` cannot be used.

See also https://github.com/phusion/baseimage-docker/issues/277
 2017-03-23 18:10:36 +00:00
Enderson Maia
59677e23c3 Preserve /bd_build/{cleanup.sh,buildconfig} files. See #188 
Signed-off-by: Enderson Maia <endersonmaia@gmail.com>
 2017-03-22 14:41:18 -03:00
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