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

Add env variables passing to riak start up script #20

Merged
merged 2 commits into from
Jul 5, 2021
Merged

Add env variables passing to riak start up script #20

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
31110b6
Add env variables passing to riak start up script
ciiol May 28, 2021
892ec2c
Update Portage and overlay commits
niku64 Jun 2, 2021
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
4 changes: 2 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
UTILS_PATH := build-utils
SERVICE_NAME := riak-base
BUILD_IMAGE_TAG := 917afcdd0c0a07bf4155d597bbba72e962e1a34a
PORTAGE_REF := 24b8642ec0a5562111df6267e967257d537c0b04
OVERLAYS_RBKMONEY_REF := 672b718c5b20d7d5c4852c924878a201aab5b625
PORTAGE_REF := 366f3e8f548f03ed8c8f43b84e06000912f8a8f9
OVERLAYS_RBKMONEY_REF := 8a54bfff180677ef2afc0db91a4e6b4ea10804e3

.PHONY: $(SERVICE_NAME) push submodules repos
$(SERVICE_NAME): .state
Expand Down
5 changes: 4 additions & 1 deletion files/riak-cluster.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,10 @@ for s in $PRESTART; do
done

# Start the node and wait until fully up
$RIAK start
# `riak start` command can be configured through env variables (e.g, WAIT_FOR_ERLANG).
# However, `riak` resets all env variables if the user is different from riak.
# So let's use su to pass the current environment into `riak` script.
su riak -c "$RIAK start"
$RIAK_ADMIN wait-for-service riak_kv

# Run all poststart scripts
Expand Down