From a724f7d3be82bd5c499511fcfd666f271e88202c Mon Sep 17 00:00:00 2001
From: 3np <3np>
Date: Mon, 4 Apr 2022 18:51:58 +0900
Subject: [PATCH] docker: .dockerignore instead of rsync to omit files

---
 .dockerignore               |  9 +++++++++
 docker/build.sh             | 18 +++---------------
 docker/clean.sh             |  3 ---
 docker/lndmanage/Dockerfile |  6 +++---
 4 files changed, 15 insertions(+), 21 deletions(-)
 create mode 100644 .dockerignore

diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 0000000..0f8472a
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,9 @@
+.gitignore
+.dockerignore
+.git/
+.idea/
+docker/*.sh
+docker/lndmanage/_src
+cache/
+README.md
+logo.png
diff --git a/docker/build.sh b/docker/build.sh
index b6ae9d0..5d234e8 100755
--- a/docker/build.sh
+++ b/docker/build.sh
@@ -6,25 +6,13 @@ cd "$(dirname "${BASH_SOURCE[0]}")"
 
 . _settings.sh
 
-# we rsync repo sources to play well with docker cache
-echo "Staging lndmanage source code..."
-mkdir -p lndmanage/_src
-rsync -a \
-  --exclude='.git/' \
-  --exclude='.idea/' \
-  --exclude='docker/' \
-  --exclude='cache/' \
-  "$LNDMANAGE_SRC_DIR" \
-  lndmanage/_src
-
-cd lndmanage
-
 echo "Building lndmanage docker container..."
 if [[ -n "$LNDMANAGE_VERBOSE" ]]; then
   set -x
 fi
 exec docker build \
-  --build-arg LNDMANAGE_HOST_SRC_PATH=_src \
+  --build-arg LNDMANAGE_HOST_SRC_PATH="${LNDMANAGE_HOST_SRC_PATH:-.}" \
   -t lndmanage:local \
+  -f ./lndmanage/Dockerfile \
   "$@" \
-  .
+  ..
diff --git a/docker/clean.sh b/docker/clean.sh
index 911cbc1..ecf25ec 100755
--- a/docker/clean.sh
+++ b/docker/clean.sh
@@ -14,8 +14,5 @@ if [[ -n "$CONTAINERS" ]]; then
   docker rm $(docker stop ${CONTAINERS})
 fi
 
-# clean source code stage
-rm -rf lndmanage/_src
-
 # clean volumes
 rm -rf _volumes
diff --git a/docker/lndmanage/Dockerfile b/docker/lndmanage/Dockerfile
index 7a990d2..a3ff968 100644
--- a/docker/lndmanage/Dockerfile
+++ b/docker/lndmanage/Dockerfile
@@ -7,7 +7,7 @@ RUN python -m venv /root/.venv
 
 ENV PATH="/root/.venv/bin:$PATH"
 
-ARG LNDMANAGE_HOST_SRC_PATH
+ARG LNDMANAGE_HOST_SRC_PATH=.
 
 COPY "$LNDMANAGE_HOST_SRC_PATH/requirements.txt" .
 COPY "$LNDMANAGE_HOST_SRC_PATH/pyproject.toml" .
@@ -41,8 +41,8 @@ ENV ADMIN_MACAROON_FILE /root/aux/admin.macaroon
 
 # copy sources under /root/lndmanage
 WORKDIR /root/lndmanage
-ARG LNDMANAGE_HOST_SRC_PATH
+ARG LNDMANAGE_HOST_SRC_PATH=.
 COPY "$LNDMANAGE_HOST_SRC_PATH" .
 
 WORKDIR /root
-COPY "home" .
+COPY "$LNDMANAGE_HOST_SRC_PATH/docker/lndmanage/home" .