Commit Graph
37 Commits
Author SHA1 Message Date
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
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
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
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
Travis Rowland 3801457f3a Merge pull request #383 from shooterman/chinese
Typo  chinese  translation
2017-04-01 19:00:00 -07: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
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
Travis Rowland d2c7194aa4 Merge pull request #379 from kingdonb/next
Fix grammar
2017-03-21 12:07:33 -07: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 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
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
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
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