From 439a94f94e982b7a89e4f7bc71e26679ddb3b5e5 Mon Sep 17 00:00:00 2001
From: Salim B <git@salim.space>
Date: Wed, 15 May 2024 18:07:36 +0200
Subject: [PATCH] refactor: ensure litestream binary is on PATH

---
 packages/nocodb/Dockerfile                 | 4 ++--
 packages/nocodb/docker/start-litestream.sh | 4 ++--
 packages/nocodb/litestream/Dockerfile      | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/nocodb/Dockerfile b/packages/nocodb/Dockerfile
index 1f1f271fe2..5a31b6f6ab 100644
--- a/packages/nocodb/Dockerfile
+++ b/packages/nocodb/Dockerfile
@@ -61,8 +61,8 @@ RUN apk --update --no-cache add \
     nodejs \
     dumb-init
 
-# Copy litestream binary build
-COPY --from=lt-builder /usr/src/lt /usr/src/appEntry/litestream
+# Copy litestream binary
+COPY --from=lt-builder /usr/src/lt /usr/local/bin/litestream
 # Copy production code & main entry file
 COPY --from=builder /usr/src/app/ /usr/src/app/
 COPY --from=builder /usr/src/appEntry/ /usr/src/appEntry/
diff --git a/packages/nocodb/docker/start-litestream.sh b/packages/nocodb/docker/start-litestream.sh
index 7acb7a72c7..db5987faef 100644
--- a/packages/nocodb/docker/start-litestream.sh
+++ b/packages/nocodb/docker/start-litestream.sh
@@ -15,12 +15,12 @@ if [ -n "${AWS_ACCESS_KEY_ID}" ] && [ -n "${AWS_SECRET_ACCESS_KEY}" ] && [ -n "$
     rm "${NC_TOOL_DIR}noco.db-wal"
   fi
 
-  /usr/src/appEntry/litestream restore -o "${NC_TOOL_DIR}noco.db" "s3://$AWS_BUCKET/$AWS_BUCKET_PATH"
+  litestream restore -o "${NC_TOOL_DIR}noco.db" "s3://$AWS_BUCKET/$AWS_BUCKET_PATH"
   if [ ! -f "${NC_TOOL_DIR}noco.db" ]
   then
     touch "${NC_TOOL_DIR}noco.db"
   fi
-  /usr/src/appEntry/litestream replicate "${NC_TOOL_DIR}noco.db" "s3://$AWS_BUCKET/$AWS_BUCKET_PATH" &
+  litestream replicate "${NC_TOOL_DIR}noco.db" "s3://$AWS_BUCKET/$AWS_BUCKET_PATH" &
 fi
 
 node docker/main.js
diff --git a/packages/nocodb/litestream/Dockerfile b/packages/nocodb/litestream/Dockerfile
index 23b9200e3f..116dc8ea1f 100644
--- a/packages/nocodb/litestream/Dockerfile
+++ b/packages/nocodb/litestream/Dockerfile
@@ -84,8 +84,8 @@ RUN apk --update --no-cache add \
     nodejs \
     tar
 
-# Copy litestream binary build
-COPY  --from=lt /usr/src/lt /usr/src/appEntry/litestream
+# Copy litestream binary
+COPY  --from=lt /usr/src/lt /usr/local/bin/litestream
 # Copy production code & main entry file
 COPY --from=builder /usr/src/app/ /usr/src/app/
 COPY --from=builder /usr/src/appEntry/ /usr/src/appEntry/