Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Run riak in a docker container for CI #1747

Merged
merged 2 commits into from
Mar 2, 2018
Merged

Run riak in a docker container for CI #1747

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4d069f2
Run riak in a docker container for CI
arcusfelis Feb 28, 2018
41b91f7
Update wait_for_healthcheck.sh code and docs
arcusfelis Mar 1, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ after_script:
services:
- redis-server
- docker
- riak

branches:
only:
Expand Down
2 changes: 1 addition & 1 deletion src/mongoose_riak.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ start() ->
{_, RiakAddr} = get_riak_opt(address, RiakOpts),
{_, RiakPort} = get_riak_opt(port, RiakOpts),
{_, Workers} = get_riak_opt(pool_size, RiakOpts, {pool_size, 20}),
SecurityOptsKeys = [credentials, cacertfile],
SecurityOptsKeys = [credentials, cacertfile, ssl_opts],
SecurityOpts = [get_riak_opt(OptKey, RiakOpts) ||
OptKey <- SecurityOptsKeys],
RiakPBOpts = [auto_reconnect, keepalive],
Expand Down
6 changes: 6 additions & 0 deletions test.disabled/ejabberd_tests/test.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,13 @@
{riak_mnesia,
[{sm_backend, "{mnesia, []}"},
{auth_method, "riak"},
%% Specify a list of ciphers to avoid
%% "no function clause matching tls_v1:enum_to_oid(28)" error
%% on Riak's side running with Erlang R16.
%% https://github.com/basho/riak-erlang-client/issues/232#issuecomment-178612129
%% We also set ciphers in tools/setup_riak on the server side.
{riak_server, "{riak_server, [{pool_size, 5}, {address, \"127.0.0.1\"},{port, 8087},
{ssl_opts, [{ciphers, [\"AES256-SHA\", \"DHE-RSA-AES128-SHA256\"]}]},
{credentials, \"ejabberd\", \"mongooseim_secret\"},
{cacertfile, \"priv/ssl/cacert.pem\"}]}."},
{mod_roster, "{mod_roster, [{backend, riak}]},"},
Expand Down
Loading