From 893c25d73f518b53373c3d724bb806dc19f79fe6 Mon Sep 17 00:00:00 2001
From: Gilles Filippini <pini@debian.org>
Date: Mon, 10 May 2021 10:47:52 +0200
Subject: [PATCH] build(docker): WORKDIR = Duniter home

And force option '--home /var/lib/duniter' in the wrapper when not given.

It should help when running an interactive shell into the instance.
---
 release/docker/Dockerfile           | 6 +++---
 release/docker/docker-entrypoint.sh | 3 ---
 release/docker/duniter.sh           | 7 +++++++
 3 files changed, 10 insertions(+), 6 deletions(-)
 create mode 100755 release/docker/duniter.sh

diff --git a/release/docker/Dockerfile b/release/docker/Dockerfile
index 10e3a137f..fefac8c94 100644
--- a/release/docker/Dockerfile
+++ b/release/docker/Dockerfile
@@ -46,8 +46,8 @@ RUN mkdir -p /var/lib/duniter /etc/duniter && chown duniter:duniter /var/lib/dun
 # copy the build artifact from the build stage
 COPY --from=build --chown=duniter:duniter /duniter/work /duniter
 
-# install duniter executable symlink
-RUN ln -s /duniter/bin/duniter /usr/bin/duniter
+# copy duniter wrapper
+COPY release/docker/duniter.sh /usr/bin/duniter
 
 # copy entrypoint
 COPY release/docker/docker-entrypoint.sh /
@@ -61,7 +61,7 @@ EXPOSE 9220 10901 20901 30901
 
 # use duniter user
 USER duniter
-WORKDIR /duniter
+WORKDIR /var/lib/duniter
 
 ENTRYPOINT ["/docker-entrypoint.sh"]
 CMD []
diff --git a/release/docker/docker-entrypoint.sh b/release/docker/docker-entrypoint.sh
index 33fea165a..9b22adcc7 100755
--- a/release/docker/docker-entrypoint.sh
+++ b/release/docker/docker-entrypoint.sh
@@ -78,9 +78,6 @@ if [ $# = 0 ]; then
   set -- direct_webstart
 fi
 
-# Set --home option
-set -- --home "$home" "$@"
-
 # Start duniter
 echo Starting duniter with:
 echo /usr/bin/duniter "$@"
diff --git a/release/docker/duniter.sh b/release/docker/duniter.sh
new file mode 100755
index 000000000..d224e4524
--- /dev/null
+++ b/release/docker/duniter.sh
@@ -0,0 +1,7 @@
+#!/bin/sh
+cd /duniter
+if [ "$1" != --home ]; then
+  set -- --home /var/lib/duniter "$@"
+fi
+exec bin/duniter "$@"
+
-- 
GitLab