Skip to content

Commit ff333c7

Browse files
committed
Docker and bootstrap fixes
1 parent 4ce513c commit ff333c7

3 files changed

Lines changed: 8 additions & 9 deletions

File tree

‎buildscripts/bootstrap/docker-compose.yaml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
---
2-
version: "3"
32
name: pybitmessage
43
services:
54
bootstrap:
65
image: pybitmessage/bootstrap:latest
7-
build: ..
6+
build: ../..
87
env_file:
98
- /etc/pybitmessage.conf
109
ports:

‎buildscripts/bootstrap/start-loadbalancer.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ echo "<Plugin curl_json>" >> $CF
2828

2929
for i in `seq 1 $THREADS`; do
3030
cont="pybitmessage-bootstrap-${i}"
31-
IP=$(docker inspect -f
32-
'{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}'
31+
IP=$(docker inspect -f \
32+
'{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' \
3333
$cont 2>/dev/null)
3434
[ -z "$IP" ] && continue
3535
echo "Adding $IP"

‎packages/docker/launcher.sh‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ sed -i -e "s|\(apiinterface = \).*|\10\.0\.0\.0|g" \
1212
-e "s|\(apipassword = \).*|\1$APIPASS|g" \
1313
-e "s|apinotifypath = .*||g" ${BITMESSAGE_HOME}/keys.dat
1414

15-
if [ -n "$PYBITMESAGE_BOOTSTRAP" -o -n "$PYBITMESSAGE_TESTNET" ]; then
15+
if [ -n "$PYBITMESSAGE_BOOTSTRAP" -o -n "$PYBITMESSAGE_TESTNET" ]; then
1616
echo "[bootstrap]" >> ${BITMESSAGE_HOME}/keys.dat
1717
fi
1818

@@ -21,23 +21,23 @@ if [ -n "$PYBITMESSAGE_BOOTSTRAP" ]; then
2121
sed -i -e "s|\(apiinterface = \).*|\1$IP|g" \
2222
-e "s|\(bind = \).*|\1$IP|g" \
2323
${BITMESSAGE_HOME}/keys.dat
24-
echo <<(EOF) >> ${BITMESSAGE_HOME}/keys.dat
24+
cat <<EOF >> ${BITMESSAGE_HOME}/keys.dat
2525
idle_timeout = 60
2626
commands = True
2727
threads = True
2828
inv = True
2929
dup_ip = True
30-
(EOF)
30+
EOF
3131
fi
3232

3333
if [ -n "$PYBITMESSAGE_TESTNET" ]; then
3434
IP=$(hostname -i)
3535
sed -i -e "s|\(apiinterface = \).*|\1$IP|g" \
3636
-e "s|\(bind = \).*|\1$IP|g" \
3737
${BITMESSAGE_HOME}/keys.dat
38-
echo <<(EOF) >> ${BITMESSAGE_HOME}/keys.dat
38+
cat <<EOF >> ${BITMESSAGE_HOME}/keys.dat
3939
testnet = True
40-
(EOF)
40+
EOF
4141
fi
4242

4343
# Run

0 commit comments

Comments
 (0)