From 032834843144e9b2bccf9ecd46b042db33fa0019 Mon Sep 17 00:00:00 2001
From: Bjarne Magnussen <bjarne.magnussen@gmail.com>
Date: Wed, 6 Nov 2019 10:05:06 +0100
Subject: [PATCH] docker: fix ltcd ports

Fixes execution in `start-ltcctl.sh` and simplifies building `PARAMS`


fixes `ltcctl` execution
---
 docker/btcd/start-btcctl.sh |  2 +-
 docker/btcd/start-btcd.sh   |  3 +--
 docker/ltcd/Dockerfile      |  7 ++-----
 docker/ltcd/start-ltcctl.sh | 21 ++++++++++++++-------
 docker/ltcd/start-ltcd.sh   |  9 ++++++---
 5 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/docker/btcd/start-btcctl.sh b/docker/btcd/start-btcctl.sh
index 7ff1aefb..c8fda50d 100755
--- a/docker/btcd/start-btcctl.sh
+++ b/docker/btcd/start-btcctl.sh
@@ -45,7 +45,7 @@ NETWORK=$(set_default "$NETWORK" "simnet")
 
 PARAMS=""
 if [ "$NETWORK" != "mainnet" ]; then
-    PARAMS=$(echo --$NETWORK)
+    PARAMS="--$NETWORK"
 fi
 
 PARAMS=$(echo $PARAMS \
diff --git a/docker/btcd/start-btcd.sh b/docker/btcd/start-btcd.sh
index 9ef605ae..4f5f7ba3 100755
--- a/docker/btcd/start-btcd.sh
+++ b/docker/btcd/start-btcd.sh
@@ -46,7 +46,7 @@ NETWORK=$(set_default "$NETWORK" "simnet")
 
 PARAMS=""
 if [ "$NETWORK" != "mainnet" ]; then
-   PARAMS=$(echo --$NETWORK)
+   PARAMS="--$NETWORK"
 fi
 
 PARAMS=$(echo $PARAMS \
@@ -72,4 +72,3 @@ PARAMS="$PARAMS $@"
 # Print command and start bitcoin node.
 echo "Command: btcd $PARAMS"
 exec btcd $PARAMS
-
diff --git a/docker/ltcd/Dockerfile b/docker/ltcd/Dockerfile
index 2746d042..75daf524 100644
--- a/docker/ltcd/Dockerfile
+++ b/docker/ltcd/Dockerfile
@@ -14,17 +14,14 @@ RUN GO111MODULE=on go install . ./cmd/ltcctl ./cmd/gencerts
 FROM alpine as final
 
 # Expose mainnet ports (server, rpc)
-EXPOSE 8333 8334
+EXPOSE 9333 9334
 
 # Expose testnet ports (server, rpc)
-EXPOSE 18333 18334
+EXPOSE 19334 19335
 
 # Expose simnet ports (server, rpc)
 EXPOSE 18555 18556
 
-# Expose segnet ports (server, rpc)
-EXPOSE 28901 28902
-
 # Copy the compiled binaries from the builder image.
 COPY --from=builder /go/bin/ltcctl /bin/
 COPY --from=builder /go/bin/ltcd /bin/
diff --git a/docker/ltcd/start-ltcctl.sh b/docker/ltcd/start-ltcctl.sh
index ec82ea4c..481586e0 100755
--- a/docker/ltcd/start-ltcctl.sh
+++ b/docker/ltcd/start-ltcctl.sh
@@ -43,10 +43,17 @@ RPCUSER=$(set_default "$RPCUSER" "devuser")
 RPCPASS=$(set_default "$RPCPASS" "devpass")
 NETWORK=$(set_default "$NETWORK" "simnet")
 
-exec ltcctl \
-    "--$NETWORK" \
-    --rpccert="/rpc/rpc.cert" \
-    --rpcuser="$RPCUSER" \
-    --rpcpass="$RPCPASS" \
-    --rpcserver="rpcserver" \
-    "$@"
+PARAMS=""
+if [ "$NETWORK" != "mainnet" ]; then
+    PARAMS="--$NETWORK"
+fi
+
+PARAMS=$(echo $PARAMS \
+    "--rpccert=/rpc/rpc.cert" \
+    "--rpcuser=$RPCUSER" \
+    "--rpcpass=$RPCPASS" \
+    "--rpcserver=rpcserver" \
+)
+
+PARAMS="$PARAMS $@"
+exec ltcctl $PARAMS
diff --git a/docker/ltcd/start-ltcd.sh b/docker/ltcd/start-ltcd.sh
index 9bdbe6d0..b6c6d699 100755
--- a/docker/ltcd/start-ltcd.sh
+++ b/docker/ltcd/start-ltcd.sh
@@ -44,8 +44,12 @@ RPCPASS=$(set_default "$RPCPASS" "devpass")
 DEBUG=$(set_default "$DEBUG" "info")
 NETWORK=$(set_default "$NETWORK" "simnet")
 
-PARAMS=$(echo \
-    "--$NETWORK" \
+PARAMS=""
+if [ "$NETWORK" != "mainnet" ]; then
+   PARAMS="--$NETWORK"
+fi
+
+PARAMS=$(echo $PARAMS \
     "--debuglevel=$DEBUG" \
     "--rpcuser=$RPCUSER" \
     "--rpcpass=$RPCPASS" \
@@ -68,4 +72,3 @@ PARAMS="$PARAMS $@"
 # Print command and start bitcoin node.
 echo "Command: ltcd $PARAMS"
 exec ltcd $PARAMS
-