From 67722e2056d599030fe52f751f06b21fcd16e312 Mon Sep 17 00:00:00 2001
From: greg stone <greg.stone@indra.org>
Date: Wed, 1 Mar 2023 13:09:18 +0000
Subject: [PATCH] refactoring indra build

---
 docker/release/targets/indra/indra.Dockerfile | 2 +-
 docker/scratch/root-fs.Dockerfile             | 9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/docker/release/targets/indra/indra.Dockerfile b/docker/release/targets/indra/indra.Dockerfile
index 59682416..830eaa82 100644
--- a/docker/release/targets/indra/indra.Dockerfile
+++ b/docker/release/targets/indra/indra.Dockerfile
@@ -24,4 +24,4 @@ USER indra:indra
 # :8334  indra RPC port
 EXPOSE 8337 8338
 
-ENTRYPOINT ["/bin/indra", "--conffile=/etc/indra/indra.conf"]
+ENTRYPOINT ["/bin/indra", "--config-file=/etc/indra/indra.conf", "--data-dir=/var/indra/data", "--logs-dir=/var/indra/logs"]
diff --git a/docker/scratch/root-fs.Dockerfile b/docker/scratch/root-fs.Dockerfile
index e96ccfcf..d919a084 100644
--- a/docker/scratch/root-fs.Dockerfile
+++ b/docker/scratch/root-fs.Dockerfile
@@ -110,13 +110,15 @@ RUN set -ex && echo "adding and permissioning /var directories" \
     && mkdir -pv /var/btcd/.btcd && chmod 750 /var/btcd/.btcd && chown btcd:btcd /var/btcd/.btcd \
     && mkdir -pv /var/lnd && chmod 750 /var/lnd && chown lnd:lnd /var/lnd \
     && mkdir -pv /var/lnd/.lnd && chmod 750 /var/lnd/.lnd && chown lnd:lnd /var/lnd/.lnd \
-    && mkdir -pv /var/indra && chmod 750 /var/indra && chown indra:indra /var/indra
+    && mkdir -pv /var/indra && chmod 750 /var/indra && chown indra:indra /var/indra \
+    && mkdir -pv /var/run/indra && chmod 750 /var/run/indra && chown indra:indra /var/run/indra
 
 RUN set -ex && echo "copying /var directories to root filesystem" \
     && cp -rp /var/btcwallet /tmp/root-fs/var/btcwallet \
     && cp -rp /var/btcd /tmp/root-fs/var/btcd \
     && cp -rp /var/lnd /tmp/root-fs/var/lnd \
-    && cp -rp /var/indra /tmp/root-fs/var/indra
+    && cp -rp /var/indra /tmp/root-fs/var/indra \
+    && cp -rp /var/run /tmp/root-fs/var/run
 
 # DEBUG
 RUN set -ex && echo "checking /var directories on root filesystem" \
@@ -127,7 +129,8 @@ RUN set -ex && echo "checking /var directories on root filesystem" \
     && ls -hal /tmp/root-fs/var/btcd/.btcd \
     && ls -hal /tmp/root-fs/var/lnd \
     && ls -hal /tmp/root-fs/var/lnd/.lnd \
-    && ls -hal /tmp/root-fs/var/indra
+    && ls -hal /tmp/root-fs/var/indra \
+    && ls -hal /tmp/root-fs/var/run/indra
 
 WORKDIR /tmp/root-fs