Travis Rowland
fc6672b4bb
Merge pull request #527 from scrapinghub/master
...
Ability to override ubuntu:18.04
2019-05-10 16:53:10 -07:00
Matyas Markovics
d616b3bafb
fix for 'ttyname failed: Inappropriate ioctl for device' during make test
2019-04-17 10:08:26 +02:00
Matyas Markovics
89597c5bc5
Use tools/docker-ssh in make ssh and in test/runner.sh to connect to container via SSH, fix SSH connection by IP issue on Mac-OS
2019-04-08 09:49:13 +02:00
Matyas Markovics
36bd41108f
Default to ubuntu BASE_IMAGE in Dockerfile, modify make to only add --build-arg to build target if BASE_IMAGE is defined, document the use of BASE_IMAGE in README
2019-04-08 09:45:37 +02:00
Matyas Markovics
6d6395c58f
invoke make from travis
2019-03-13 11:34:47 +01:00
Matyas Markovics
4a3476b6a6
send tests over in ssh, instead of mounting them
2019-03-13 11:09:41 +01:00
Matyas Markovics
ad88ec9226
ssh by IP in test; verbose SSH into container
2019-03-13 10:37:56 +01:00
Matyas Markovics
17a737f47b
remove interactive and TTY flags when Enabling SSH in test
2019-03-13 10:12:22 +01:00
Matyas Markovics
9d29b23db2
exclude mounts (e.g.: /proc) from cleanup
2019-03-13 09:59:33 +01:00
Matyas Markovics
089258a746
if both NAME and BASE_IMAGE are defined, don't append variant to baseimage
2019-03-13 01:00:13 +01:00
Matyas Markovics
4f65f0a270
build-arg to define base-image, fix locale for Debian
2019-03-12 23:28:58 +01:00
Travis Rowland
14394bcb3f
Merge pull request #523 from pmav99/python_bytecode
...
Remove python bytecode
2019-01-14 06:57:56 -08:00
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
Panos Mavrogiorgos
d0b150c5ef
Remove python bytecode
2019-01-04 08:18:58 +02:00
Silke Meyer
c18b511311
Fixed wrong line breaks in syslog-ng's logrotate config
2018-12-25 10:34:05 +01: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
Kingdon Barrett
31fce7a874
clarifications and corrections
2018-11-20 10:03:00 -05:00
Kingdon Barrett
55bb086681
addressing the confusion in issue #459
2018-11-20 08:19:28 -05:00
Travis Rowland
dd699da614
Merge pull request #519 from kingdonb/fix-timeout-docs
...
documentation for #510
2018-10-23 14:14:24 -07:00
Kingdon Barrett
1be96f1edf
documentation for #510
...
closes #517
2018-10-21 11:43:38 -04: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
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
