Skip to content

Commit 334f508

Browse files
committed
Fix build error
1 parent 67aeaad commit 334f508

File tree

1 file changed

+10
-4
lines changed

1 file changed

+10
-4
lines changed

Makefile

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -144,13 +144,14 @@ scylla/clean:
144144
sudo rm -rf $(WORKING_DIRECTORY)/.tmp/scylla || :
145145

146146
scylla: scylla/clean
147-
mkdir -p $(WORKING_DIRECTORY)/.tmp/scylla/data $(WORKING_DIRECTORY)/.tmp/scylla/commitlog $(WORKING_DIRECTORY)/.tmp/scylla/hints $(WORKING_DIRECTORY)/.tmp/scylla/view_hints $(WORKING_DIRECTORY)/.tmp/scylla/etc
147+
mkdir -p $(WORKING_DIRECTORY)/.tmp/scylla/etc ;
148148
docker run --rm \
149+
--user $(USER_ID):$(GROUP_ID) \
149150
-v $(WORKING_DIRECTORY)/.tmp/scylla/etc:/etc-scylla-tmp \
150151
--entrypoint /bin/cp \
151152
scylladb/scylla \
152153
/etc/scylla/scylla.yaml /etc-scylla-tmp/scylla.yaml
153-
sudo chown $(shell whoami) $(WORKING_DIRECTORY)/.tmp/scylla/etc/scylla.yaml
154+
sudo chown $(shell whoami):$(shell id -gn) $(WORKING_DIRECTORY)/.tmp/scylla/etc/scylla.yaml
154155

155156
yq -i '.server_encryption_options.internode_encryption="all"' $(WORKING_DIRECTORY)/.tmp/scylla/etc/scylla.yaml
156157
yq -i '.server_encryption_options.certificate="/certs/http.crt"' $(WORKING_DIRECTORY)/.tmp/scylla/etc/scylla.yaml
@@ -175,18 +176,23 @@ scylla: scylla/clean
175176

176177
docker run \
177178
-d \
178-
--network=host \
179179
--name=scylla \
180+
--network=host \
180181
-v $(WORKING_DIRECTORY)/.tmp/scylla/etc/scylla.yaml:/etc/scylla/scylla.yaml \
181-
-v $(WORKING_DIRECTORY)/.tmp/scylla:/var/lib/scylla \
182182
-v $(CERT_PATH):/certs \
183183
scylladb/scylla --developer-mode 1 --listen-address 127.0.0.1
184184

185+
@MAX_RETRIES=300; \
186+
i=0; \
185187
while true; do \
186188
i=$$((i+1)); \
187189
if openssl s_client -connect 127.0.0.1:9142 -cert $(CERT_PATH)/http.crt -key $(CERT_PATH)/http.key <<< "Q" 2>/dev/null > /dev/null; then \
188190
break; \
189191
fi; \
192+
if [ "$$i" -ge "$$MAX_RETRIES" ]; then \
193+
echo "Scylla did not become ready after $$i seconds. Exiting."; \
194+
exit 1; \
195+
fi; \
190196
echo "Try to reconnect to scylla(127.0.0.1:9142) $$i"; \
191197
sleep 1; \
192198
done

0 commit comments

Comments
 (0)