Commit Graph

6 Commits

Author SHA1 Message Date
proller
1bf49fe844 Docker fixes 2018-04-18 00:03:33 +03:00
proller
ee087a1541 Fix query compile in docker, update docker image to ubuntu 17.10 artful (#2126)
* Squashed commit of the following:

commit bedcf840b563aad3edb03b43417338fab0e7cb48
Author: proller <proller@github.com>
Date:   Mon Apr 2 20:17:36 2018 +0300

    Revert "Prepare to new poco (PocoData renamed to PocoSQL)"

    This reverts commit ad5e11ad88ac4f1c3a5ad21153042e2498ca0d68.

commit b7f1c352f0eb132b133846c7214e70a79f26e611
Merge: ad5e11ad8 fb7e2cbd1
Author: proller <proller@github.com>
Date:   Mon Apr 2 20:12:10 2018 +0300

    Merge remote-tracking branch 'upstream/master' into fix3

commit ad5e11ad88ac4f1c3a5ad21153042e2498ca0d68
Author: proller <proller@github.com>
Date:   Mon Apr 2 20:09:49 2018 +0300

    Prepare to new poco (PocoData renamed to PocoSQL)

commit fcb90ca39dd32a29e29eb68bf559f381e80f74b4
Merge: 9ded77d62 ad137994f
Author: proller <proller@github.com>
Date:   Mon Apr 2 13:17:01 2018 +0300

    Merge remote-tracking branch 'upstream/master' into fix3

commit 9ded77d62aa668c6b7b55d209d5760bc5b517fbf
Merge: 14cea9052 412edac65
Author: proller <proller@github.com>
Date:   Fri Mar 30 21:06:20 2018 +0300

    Merge remote-tracking branch 'upstream/master' into fix3

commit 14cea90524b8b977bff9b85647e00f0e1c26570b
Merge: 9b6d88e67 82932f904
Author: proller <proller@github.com>
Date:   Fri Mar 30 14:55:42 2018 +0300

    Merge remote-tracking branch 'upstream/master' into fix3

commit 9b6d88e67b114a4c42b624690d691988be39f227
Merge: 0afe7b7d1 b99783028
Author: proller <proller@github.com>
Date:   Thu Mar 29 20:35:15 2018 +0300

    Merge remote-tracking branch 'upstream/master' into fix3

commit 0afe7b7d1f4792403ba4fb33dfb250ece2edc41d
Author: proller <proller@github.com>
Date:   Wed Mar 28 16:03:55 2018 +0300

    add docker/test

commit c46f0b4084610a6d36b6823fb5ee48381866272e
Author: proller <proller@github.com>
Date:   Wed Mar 28 15:43:53 2018 +0300

    fix

commit 3435dee49f31fe8f6cd9b01da4a2d5820f03a4a4
Author: proller <proller@github.com>
Date:   Wed Mar 28 15:18:54 2018 +0300

    Fix query compile in docker, update docker image to ubuntu 17.10 artful

* Update Dockerfile
2018-04-07 06:47:54 +03:00
proller
bbb12e89f0 Better listen_try, pbuilder fix (#2068)
* rename libboost/boost_1_65_0 -> contrib/boost ; make submodule ; update boost to 1.66.0

* Update contrib/boost

* Update contrib/boost

* Add comments

* Fix

* Pbuilder fix

* Better listen_try

* Much better listen_try

* Revert "remove ipv6 listen_host from docker_related_config to allow running in ipv4-only dockers"

This reverts commit 3cfa4c3e65.

* Fix freebsd and macos build
2018-03-18 12:02:29 +03:00
Alex Zatelepin
3cfa4c3e65
remove ipv6 listen_host from docker_related_config to allow running in ipv4-only dockers 2018-03-12 18:13:33 +03:00
proller
2d9f66115f listen_try config option (#1892)
* Docker wip

* no tests

* fixes

* No tests

* Fixes

* Clean

* listen_try config option

* listen_try for tests
2018-02-12 22:36:18 +03:00
Nikolay Volosatov
e41952c892 replace sed command with explicit config for docker 2018-01-22 10:51:27 +03:00