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

417 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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 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
Travis Rowland
c1d2b4bad8 Update README.md 
Adding travis-ci badge to README.md
 2017-03-21 01:49:54 -07:00
Travis Rowland
8f33bcf3d2 Create .travis.yml 
Adding Travis-CI
 2017-03-21 01:26:07 -07:00
Travis Rowland
ce2a25ddc0 Merge pull request #372 from phusion/next 
Update README.md regarding ignored env vars.
 2017-03-20 21:00:29 -07:00
Travis Rowland
7e02e426e5 Update README.md regarding ignored env vars. 
Closes #119
 2017-03-20 20:59:39 -07:00
Travis Rowland
cc1659b829 Merge pull request #371 from phusion/next 
Updating README.md Fixes #228
 2017-03-20 20:50:52 -07:00
Travis Rowland
5205fa04f7 Updating README.md Fixes #228 2017-03-20 20:48:24 -07:00
Travis Rowland
70e2551ca7 Merge pull request #369 from kingdonb/i386-next 
WIP: fix libgc bug for i386 baseimage-docker
 2017-03-20 20:37:33 -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
Travis Rowland
8c842a35d7 Merge pull request #188 from endersonmaia/preserve-some-build-scripts 
Preserve /build/{cleanup.sh,buildconfig} files.
 2017-03-20 12:43:06 -07: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
75784205cf Merge branch 'pavlobaron-master' into next 2017-03-19 16:18:16 -07: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
5cc60221e6 Document selection of syslog-ng over rsyslog 
Fixes #114
 2017-03-19 01:57:18 -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
1c6b9f11d1 Merge pull request #354 from wangyuehong/master 
fix typos for README_ZH_cn_.md and README_ZH_tw_.md
 2017-03-19 01:30:40 -07:00
Travis Rowland
e12eeb8083 Merge pull request #352 from jedie/patch-2 
README: "RUN chmod +x /etc/my_init.d/logtime.sh"
 2017-03-19 01:29:46 -07:00
Travis Rowland
d8a7ca7a4d Merge branch 'next' into patch-2 2017-03-19 01:29:24 -07:00
Travis Rowland
96a2d92978 Merge pull request #351 from jedie/patch-1 
README: "RUN chmod +x /etc/service/memcached/run"
 2017-03-19 01:26:04 -07:00
Travis Rowland
67a0c6d121 Merge branch 'next' into patch-1 2017-03-19 01:25:43 -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
e89e07acb5 Merge pull request #334 from nawork/master 
Removing -f option of `docker tag`
 2017-03-19 01:01:55 -07:00
Travis Rowland
116cf0e2dd Merge pull request #209 from pbecotte/master 
Add instructions for enabling sshd on the fly without permanently enabli...
 2017-03-19 00:26:28 -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