File tree Expand file tree Collapse file tree 1 file changed +10
-4
lines changed Expand file tree Collapse file tree 1 file changed +10
-4
lines changed Original file line number Diff line number Diff line change @@ -144,13 +144,14 @@ scylla/clean:
144
144
sudo rm -rf $(WORKING_DIRECTORY ) /.tmp/scylla || :
145
145
146
146
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 ;
148
148
docker run --rm \
149
+ --user $(USER_ID ) :$(GROUP_ID ) \
149
150
-v $(WORKING_DIRECTORY ) /.tmp/scylla/etc:/etc-scylla-tmp \
150
151
--entrypoint /bin/cp \
151
152
scylladb/scylla \
152
153
/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
154
155
155
156
yq -i '.server_encryption_options.internode_encryption="all"' $(WORKING_DIRECTORY)/.tmp/scylla/etc/scylla.yaml
156
157
yq -i '.server_encryption_options.certificate="/certs/http.crt"' $(WORKING_DIRECTORY)/.tmp/scylla/etc/scylla.yaml
@@ -175,18 +176,23 @@ scylla: scylla/clean
175
176
176
177
docker run \
177
178
-d \
178
- --network=host \
179
179
--name=scylla \
180
+ --network=host \
180
181
-v $(WORKING_DIRECTORY)/.tmp/scylla/etc/scylla.yaml:/etc/scylla/scylla.yaml \
181
- -v $(WORKING_DIRECTORY)/.tmp/scylla:/var/lib/scylla \
182
182
-v $(CERT_PATH):/certs \
183
183
scylladb/scylla --developer-mode 1 --listen-address 127.0.0.1
184
184
185
+ @MAX_RETRIES=300; \
186
+ i=0; \
185
187
while true; do \
186
188
i=$$((i+1)); \
187
189
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 \
188
190
break; \
189
191
fi; \
192
+ if [ "$$i" -ge "$$MAX_RETRIES" ]; then \
193
+ echo "Scylla did not become ready after $$i seconds. Exiting."; \
194
+ exit 1; \
195
+ fi; \
190
196
echo "Try to reconnect to scylla(127.0.0.1:9142) $$i"; \
191
197
sleep 1; \
192
198
done
You can’t perform that action at this time.
0 commit comments