valitydev/image-riak-base
14
0
Fork 0
mirror of https://github.com/valitydev/image-riak-base.git synced 2024-11-06 02:05:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Riak 2.9.2 (#9)

Browse Source 
* Riak 2.9.2

* Remove riak from init

* Fix reltool.config

* Fix path
This commit is contained in:
Sergey Yelin 2020-04-09 11:40:34 +03:00 committed by GitHub
parent 565e6ecd59
commit 38fbd6239f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitmodules vendored
View File

@ -2,7 +2,3 @@
path = build-utils
url = git+ssh://git@github.com/rbkmoney/build_utils.git
branch = master
[submodule "riak"]
path = riak
url = https://github.com/basho/riak.git
branch = develop-2.9

1
Dockerfile.sh
View File

@ -12,6 +12,7 @@ COPY files/install.sh /
COPY files/install-riak.sh /
COPY files/vars.config /
COPY files/riak.patch /
COPY files/riak_core.patch /
COPY files/erlang_otp.patch /
RUN /install.sh
RUN /install-riak.sh

2
Makefile
View File

@ -21,7 +21,7 @@ else \
echo `git name-rev --name-only HEAD`; \
fi)
SUBMODULES = $(UTILS_PATH) riak
SUBMODULES = $(UTILS_PATH)
SUBTARGETS = $(patsubst %,%/.git,$(SUBMODULES))
REPOS = portage overlays/rbkmoney

2
build-utils

@ -1 +1 @@
Subproject commit cf6578dac794859b0495c812761ce5b94c11bbaf
Subproject commit 03ffefb1e039d02ce770adca145fa803b3dddcd4

3
files/install-riak.sh
View File

@ -5,7 +5,7 @@ source /lib/gentoo/functions.sh
source /etc/portage/make.conf
# Build riak
export GIT_BRANCH_RIAK=riak-2.9.1
export GIT_BRANCH_RIAK=riak-2.9.2
cd /opt
git clone -n -b $GIT_BRANCH_RIAK https://github.com/basho/riak.git riak
@ -13,4 +13,5 @@ cd riak
git checkout -q $GIT_BRANCH_RIAK
git apply < /riak.patch
make locked-deps
patch -p 0 < /riak_core.patch
make rel OVERLAY_VARS="overlay_vars=/vars.config"

2
files/install.sh
View File

@ -13,7 +13,7 @@ export GIT_BRANCH_OTP=basho-otp-16
# Build OpenSSL
cd /opt
curl -OL https://www.openssl.org/source/openssl-${OPENSSL_VERSION}.tar.gz;
curl -OL https://www.openssl.org/source/old/1.0.2/openssl-${OPENSSL_VERSION}.tar.gz;
tar -xf openssl-${OPENSSL_VERSION}.tar.gz;
cd openssl-${OPENSSL_VERSION}; \
./config shared no-krb5 -fPIC; \

3
files/riak.patch
View File

@ -54,8 +54,7 @@ index 14c92513..5a4b97fb 100644
%% ex: ft=erlang ts=4 sw=4 et
{sys, [
{lib_dirs, ["../deps"]},
- {rel, "riak", "2.9.0",
+ {rel, "riak", "2.9.1",
{rel, "riak", "2.9.2",
[
kernel,
stdlib,

11
files/riak_core.patch Normal file
View File

@ -0,0 +1,11 @@
--- deps/riak_core/src/riak_core_handoff_status.erl.orig 2020-04-08 14:27:24.000000000 +0300
+++ deps/riak_core/src/riak_core_handoff_status.erl 2020-04-08 14:31:55.000000000 +0300
@@ -133,7 +133,7 @@
format_transfer_size({Num, objects}) ->
io_lib:format("~B Objs", [Num]);
format_transfer_size({Num, bytes}) ->
- riak_core_format:human_size_fmt("~B", Num);
+ riak_core_format:human_size_fmt("~.2f", Num);
format_transfer_size(_) ->
"--".

1
riak

@ -1 +0,0 @@
Subproject commit beb26616ea347695c63a1c4c2dd0630b673452fd