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
395 Commits 4 Branches 43 Tags
d6702be8c368ad4e6aa0419911e033e9096c3828
Commit Graph

395 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Travis Rowland
b57f08c71f Merge pull request #409 from goneio/refactor/remove-unnecessary-env-layers 
Remove 3 unnecessary layers from the layer count.
 2017-05-23 14:15:51 -07:00
Matthew Baggett
a3faefd3d3 Remove 3 unnecessary layers from the layer count. 2017-05-18 13:59:29 +01:00
Travis Rowland
cd23614b27 Revert "Incrementing version to 0.9.23" 
This reverts commit 914f0967b0.
0.9.22 		2017-05-17 15:14:56 -07:00
Travis Rowland
914f0967b0 Incrementing version to 0.9.23 2017-05-17 15:12:05 -07: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
Travis Rowland
59d209cbe8 Merge pull request #399 from josegonzalez/patch-1 
Improve pep8 compliance
 2017-05-08 20:46:45 -07: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
Travis Rowland
8f7fcfec33 Merge pull request #396 from xmjiao/patch-1 
Suppress the status reports from "sv -w"
 2017-04-22 23:46:32 -07:00
Xiangmin Jiao
b2c329af51 Suppress the status reports from "sv -w" 2017-04-22 20:46:36 -04:00
Kingdon Barrett
f012793a75 Merge pull request #395 from phusion/fix-pam-build 
fixes the build
 2017-04-19 20:21:17 -04:00
Kingdon Barrett
d3af157387 fixes the build 
pam sources are missing (they were in main)
 2017-04-19 20:11:06 -04:00
Travis Rowland
9c934771ad Merge pull request #392 from tgranqvist/master 
https://github.com/phusion/baseimage-docker/issues/391
 2017-04-13 01:14:01 -07:00
Tom Granqvist
7f7b164d20 Merge pull request #1 from tgranqvist/tgranqvist-patch-1 
Fixing bug in my_init.shutdown_runit_services
 2017-04-13 11:09:37 +03: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
Travis Rowland
287e96c811 Update Makefile 
Incrementing version for next release.
 2017-04-11 01:31:10 -07:00
Travis Rowland
a6fd9f8b56 Merge pull request #389 from phusion/next 
Release 0.9.20
 2017-04-11 01:22:41 -07:00
Travis Rowland
10d2364014 Update Makefile 
Incrementing version
0.9.21 		2017-04-11 01:08:24 -07:00
Travis Rowland
8af7692f62 Merge pull request #388 from optimisticanshul/patch-1 
down wait for 7 secs this will fix it.
 2017-04-11 00:59:08 -07:00
Anshul Sharma
ac382d47b8 down wait for 7 secs this will fix it. 2017-04-11 08:07:32 +05:30
Travis Rowland
a7b8b36359 Update Changelog.md 
Removing CHANGELOG.md
 2017-04-08 00:18:10 -07:00
Travis Rowland
41fbb91544 Merge pull request #385 from jsravn/fix-kill-timeouts 
Fix kill timeouts
 2017-04-07 03:52:41 -07:00
James Ravn
93477b34cc Update README.md 2017-04-07 11:45:55 +01:00
James Ravn
f706ea8d92 Add shutdown details to README 2017-04-07 11:44:20 +01:00
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
3801457f3a Merge pull request #383 from shooterman/chinese 
Typo  chinese  translation
 2017-04-01 19:00:00 -07:00
shooter
079464dc43 typo 2017-03-31 21:24:15 +08:00
shooter
8b99273eb6 typo 
Make the sentence more smooth
 2017-03-31 18:35:24 +08:00
shooter
3c0e09426d typo chinese translation 
'负责' means 'responsible'
'复杂' means 'complex', metaphorical meaning  'too noisy'
 2017-03-31 17:36:31 +08: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
Travis Rowland
3a315a1590 Merge pull request #380 from endersonmaia/preserve-some-build-files 
Preserve /bd_build/{cleanup.sh,buildconfig} files. See #188
 2017-03-22 14:47:35 -07: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
d2c7194aa4 Merge pull request #379 from kingdonb/next 
Fix grammar
 2017-03-21 12:07:33 -07:00
Kingdon Barrett
00034a9965 Fix grammar 
Looks like a proofreading error
 2017-03-21 09:26:00 -04:00
Travis Rowland
ce6a9e0dfc Merge pull request #378 from phusion/next 
Release 0.9.20
 2017-03-21 04:23:33 -07:00
Travis Rowland
17a5cede8c Incrementing version 0.9.20 2017-03-21 03:37:18 -07: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
5d80f284b0 Merge pull request #374 from romantic668/next 
Update README.md
 2017-03-21 02:49:26 -07:00
Travis Rowland
e3eeed2091 Merge pull request #376 from phusion/revert-188-preserve-some-build-scripts 
Revert "Preserve /build/{cleanup.sh,buildconfig} files."
 2017-03-21 02:48:11 -07:00
Travis Rowland
f9838ccce0 Revert "Preserve /build/{cleanup.sh,buildconfig} files." 2017-03-21 02:41:20 -07:00
romantic668
ce5038b2a7 Update README.md 
Hi, I am doing a technical writing project. It is good practice to keep the writing concise. For example, I removed ...supposed to... Though it may lead to loss in meaning, readers will benefit from this concision. Hope it helps
 2017-03-21 02:20:17 -07:00