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
Floor Drees
ac37bcf2bd
Update contact persons
2018-09-13 08:30:55 -04:00
Niels van der Zanden
0d22512947
Add consultancy, fix logo in README
2018-09-13 13:59:48 +02:00
PikachuEXE
4e78e19a34
Point OS version in other section to overview
...
[ci skip]
2018-09-13 10:23:45 +08: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
Cody Welsh
10c7bbf3b4
docs(README): Add more daemon info
...
Gives the "Adding Additional Daemons" section of the README some extra
information, including another warning not to use `-it <cmd>` when
starting a given container.
2018-09-03 21:31:55 -07:00
jari.schaefer
b41f997b6c
increase default kill timeout from 5 to 30 seconds
2018-08-31 22:49:08 +02:00
Kingdon Barrett
c14fecb3b1
Merge branch 'master' into master
2018-08-24 17:49:09 -04: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
Tobias Pfeiffer
8b50080470
use sv force-stop instead of sv down to stop services
2018-08-24 12:00:51 +09:00
awking
dd336f2bf0
change version from 16.04 to 18.04
2018-08-21 11:44:55 +08: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
David Bernick
a018aba0c2
syslog fix
2018-07-16 12:46:18 -04:00
Rowan Wookey
dd9d23f1ea
Fix /var/log permissions on syslog-ng startup
2018-06-30 10:58:14 +01:00
Arnold Hendriks
d796c2e32c
Add gpg-agent and dirmngr so 'apt-key' works out of the box again, just like it did on the 16.04 phusion image
2018-04-27 20:40:49 +02:00
Arnold Hendriks
f936902c23
Update syslog configuration (took the diff between stock 16.04 and phusion 16.04 to figure out what to apply to the stock 18.04 syslog conf) as it complains about old config format
2018-04-27 20:40:49 +02:00
Arnold Hendriks
43791943e5
Update the baseimage to use, see https://hub.docker.com/r/library/ubuntu/tags/
...
Taking the bionic tag because so far the 'latest' and 18.04 tags haven't been updated yet
2018-04-27 20:40:48 +02:00
Arnold Hendriks
2f0e1ad0b8
Allow 'make test' to work on macOS by publishing the SSH port and using that during tests, as the IP address cannot be directly reached on macOS docker
2018-04-09 23:08:01 +02: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
Andres Heinloo
cb8cd8ad82
fix syslog reload
2018-03-16 18:24:00 +01:00
Floor Drees
69a8fc1246
update Code of Conduct with contact persons
2018-03-05 10:30:11 +01: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
David Hiendl
be8fc49e52
fixed syslog warning when using --tty as described in #468
2018-02-22 08:53:27 +01: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
Zsolt Ero
9d63ae751c
RAM usage updated in readme
2018-02-17 02:28:14 +01:00
Zsolt Ero
c5b6ed442d
readme fix
2018-02-17 02:05:21 +01:00
Zsolt Ero
c40591ee2c
removed syslog-forwarder from readme
2018-02-17 02:03:32 +01: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
Marc Bihlmaier
768d4b4d3f
fix SSH README.md
2018-01-31 11:33:17 +01:00
rdxmb
b20ebe448c
Merge pull request #1 from phusion/master
...
Rebase
2018-01-31 11:18:19 +01: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
