 Travis Rowland
|
a9fdb8878d
|
Merge pull request #522 from silke/master
Fixed wrong line breaks in syslog-ng's logrotate config
|
2019-01-14 06:57:10 -08:00 |
|
|
Travis Rowland
|
60e2cdd375
|
Merge pull request #520 from kingdonb/issue-459
addressing the confusion in issue #459
|
2018-11-26 11:00:38 -08:00 |
|
|
Travis Rowland
|
dd699da614
|
Merge pull request #519 from kingdonb/fix-timeout-docs
documentation for #510
|
2018-10-23 14:14:24 -07:00 |
|
|
Travis Rowland
|
8be7395886
|
Merge pull request #510 from jarischaefer/increase-kill-timeout
increase default kill timeout from 5 to 30 seconds
|
2018-10-11 11:26:29 -07:00 |
|
|
Travis Rowland
|
a9ae3334ed
|
Merge branch 'master' into increase-kill-timeout
|
2018-10-11 11:26:11 -07:00 |
|
|
Travis Rowland
|
3b511622e0
|
Merge pull request #511 from CWelshE/master
docs(README): Add more daemon info
|
2018-09-14 15:50:21 -07:00 |
|
|
Travis Rowland
|
fdc1008c17
|
Merge pull request #512 from PikachuEXE/doc/update-os-version
Point OS version in other section to overview
|
2018-09-14 15:47:18 -07:00 |
|
|
Travis Rowland
|
14d156ce73
|
Merge pull request #505 from awking/master
change version from 16.04 to 18.04
|
2018-09-12 01:19:07 -07:00 |
|
|
Travis Rowland
|
3e62736510
|
Merge pull request #507 from tgpfeiffer/fix/506-escalate-term
use `sv force-stop` instead of `sv down` to stop services
|
2018-08-23 22:18:31 -07:00 |
|
|
Travis Rowland
|
e8d48f3af4
|
Update Makefile
|
2018-08-16 00:01:31 -07:00 |
|
|
Travis Rowland
|
d37f7aff3f
|
Merge pull request #488 from unilynx/ubuntu-1804
Ubuntu 18.04
|
2018-08-15 23:56:52 -07:00 |
|
|
Travis Rowland
|
f802be0dfe
|
Merge branch 'master' into ubuntu-1804
|
2018-08-15 23:55:47 -07:00 |
|
|
Travis Rowland
|
5493db5179
|
Update Dockerfile
|
2018-08-15 23:54:56 -07:00 |
|
|
Travis Rowland
|
becf747182
|
Update Makefile
|
2018-08-15 23:47:10 -07:00 |
|
|
Travis Rowland
|
0c9eaf3c43
|
Merge branch 'master' into ubuntu-1804
|
2018-08-13 10:11:30 -07:00 |
|
|
Travis Rowland
|
673cd89f41
|
Merge pull request #501 from davidbernick/bernick_18.04
syslog fix
|
2018-07-18 08:18:17 -07:00 |
|
|
Travis Rowland
|
8cf2e208ff
|
Merge branch 'master' into bernick_18.04
|
2018-07-18 08:17:52 -07:00 |
|
|
Travis Rowland
|
924f874d7e
|
Update Dockerfile
|
2018-07-18 08:17:29 -07:00 |
|
|
Travis Rowland
|
b89b718067
|
Merge pull request #497 from rwky/logrotate-permissions-fix
Fix /var/log permissions on syslog-ng startup
|
2018-07-18 08:09:40 -07:00 |
|
|
Travis Rowland
|
422781c7cf
|
Merge branch 'master' into logrotate-permissions-fix
|
2018-07-18 08:08:34 -07:00 |
|
|
Travis Rowland
|
ed15d0d250
|
Merge pull request #487 from unilynx/support-maketest-on-osx
Allow 'make test' to work on macOS by publishing the SSH port
|
2018-07-18 07:45:32 -07:00 |
|
|
Travis Rowland
|
92a357a41f
|
Merge pull request #478 from andres-h/master
fix syslog reload
|
2018-04-02 00:49:31 -07:00 |
|
|
Travis Rowland
|
996e31b743
|
Incrementing version AFFECTS #485
|
2018-04-02 00:25:08 -07:00 |
|
|
Travis Rowland
|
12718e6954
|
Merge pull request #470 from davidhiendl/master
fixed syslog warning when using --tty as described in #468
|
2018-03-04 19:53:43 -03:00 |
|
|
Travis Rowland
|
14896d9181
|
Merge pull request #466 from phusion/readme-fix
removed syslog-forwarder from readme
|
2018-02-19 17:13:21 -08:00 |
|
|
Travis Rowland
|
be5d910bad
|
Merge pull request #445 from phusion/Theaxiom-patch-1
my_init exits with 0 on SIGINT after runit is started
|
2018-01-31 23:09:55 -08:00 |
|
|
Travis Rowland
|
db73c10615
|
Merge branch 'master' into Theaxiom-patch-1
|
2018-01-31 22:57:45 -08:00 |
|
|
Travis Rowland
|
733dac8706
|
Merge pull request #465 from rdxmb/master
README.md -> fix SSH docs
|
2018-01-31 22:56:16 -08:00 |
|
|
Travis Rowland
|
adf8fd7805
|
Latest tag not yet necessary
|
2018-01-26 02:51:52 -08:00 |
|
|
Travis Rowland
|
670f189553
|
Merge pull request #463 from phusion/ci-test
Ci test
|
2018-01-26 02:44:52 -08:00 |
|
|
Travis Rowland
|
e81e664a72
|
Push master as latest
|
2018-01-26 02:36:46 -08:00 |
|
|
Travis Rowland
|
6b8be06bba
|
GitLab CI is better
|
2018-01-26 02:26:03 -08:00 |
|
|
Travis Rowland
|
efc5865789
|
Was using incorrect variable replacements
|
2018-01-26 02:17:56 -08:00 |
|
|
Travis Rowland
|
300b96fb93
|
build local Dockerfile
|
2018-01-26 02:01:09 -08:00 |
|
|
Travis Rowland
|
1bffe76e6a
|
don't remove image
|
2018-01-26 01:58:22 -08:00 |
|
|
Travis Rowland
|
7a639692ab
|
Automated Docker builds
|
2018-01-26 01:54:38 -08:00 |
|
|
Travis Rowland
|
fdfe6b1937
|
Merge pull request #449 from phusion/Theaxiom-patch-2
Incrementing version AFFECTS #448
|
2018-01-26 01:25:41 -08:00 |
|
|
Travis Rowland
|
90e411fec2
|
Merge branch 'master' into Theaxiom-patch-1
|
2017-11-23 15:13:09 -08:00 |
|
|
Travis Rowland
|
95d89dd251
|
Merge branch 'master' into Theaxiom-patch-2
|
2017-11-23 15:12:00 -08:00 |
|
|
Travis Rowland
|
06e2983ba9
|
Merge pull request #453 from sundbry/sigint-logging
Fork syslog-ng into a new process group via bash monitor mode
|
2017-11-23 15:11:35 -08:00 |
|
|
Travis Rowland
|
5ab2367f76
|
Merge branch 'master' into sigint-logging
|
2017-11-23 12:28:39 -08:00 |
|
|
Travis Rowland
|
61d585bce9
|
Merge pull request #447 from kamermans/bugfix/syslog_unclean_shutdown
Gracefully handle syslog-ng shutdown
|
2017-11-23 12:28:14 -08:00 |
|
|
Travis Rowland
|
338238d685
|
Merge branch 'master' into Theaxiom-patch-2
|
2017-11-02 11:47:18 -07:00 |
|
|
Travis Rowland
|
c5680a44b1
|
Merge pull request #446 from phusion/add-code-of-conduct-1
Create CODE_OF_CONDUCT.md
|
2017-11-02 11:46:51 -07:00 |
|
|
Travis Rowland
|
4468bb296e
|
Incrementing version AFFECTS #448
|
2017-11-02 09:34:12 -07:00 |
|
|
Travis Rowland
|
4cb596bfc9
|
Create CODE_OF_CONDUCT.md
|
2017-11-01 12:16:33 -07:00 |
|
|
Travis Rowland
|
42c48d8465
|
Merge pull request #425 from sundbry/syslog-shutdown
Start syslog-ng before runit, and stop after runit.
|
2017-11-01 12:06:35 -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 |
|
|
Travis Rowland
|
c7efb776b8
|
Merge pull request #439 from mortn/patch-1
Adding "more" to the first sentence.
|
2017-10-09 10:31:52 -07:00 |
|
|
Travis Rowland
|
1a235a13e1
|
Update my_init
|
2017-07-31 21:49:57 -04: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 |
|
|
Travis Rowland
|
cd23614b27
|
Revert "Incrementing version to 0.9.23"
This reverts commit 914f0967b0.
|
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 |
|
|
Travis Rowland
|
59d209cbe8
|
Merge pull request #399 from josegonzalez/patch-1
Improve pep8 compliance
|
2017-05-08 20:46:45 -07: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 |
|
|
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 |
|