1
0
mirror of https://github.com/phusion/baseimage-docker.git synced 2026-03-26 12:29:07 +00:00
Commit Graph

24 Commits

Author SHA1 Message Date
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
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
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
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
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
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
pavlobaron
ea6b0ace79 configure process kill timeouts through environment with fallbacks 2016-01-22 09:49:48 +01: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)
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)
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)
19c2df66b3 Remove workaround for Docker bug #2267 now that Docker has fixed this
Closes GH-155.
2015-01-16 16:50:39 +01: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 (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