From 600625c83cd8326513f244ede1e6a6d4a91b10aa Mon Sep 17 00:00:00 2001
From: Toastie <toastie@toastiet0ast.com>
Date: Thu, 13 Feb 2025 12:38:00 +1300
Subject: [PATCH] dockerfile improvements, changed env prefix to bot_

---
 .dockerignore        | 3 ++-
 Dockerfile           | 2 +-
 docker-entrypoint.sh | 7 +++++--
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/.dockerignore b/.dockerignore
index c84eea1..e9a5c89 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -10,4 +10,5 @@
 
 # ignore bin and obj folders in projects
 src/**/bin/*
-src/**/obj/*
\ No newline at end of file
+src/**/obj/*
+src/EllieBot/data/creds.yml
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index 3f53c72..8b77dca 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -57,4 +57,4 @@ VOLUME [ "/app/data" ]
 
 # Set the entrypoint and default command
 ENTRYPOINT [ "/usr/local/sbin/docker-entrypoint.sh" ]
-CMD ./EllieBot
\ No newline at end of file
+CMD [ "./EllieBot" ]
\ No newline at end of file
diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
index 20de617..924f73c 100644
--- a/docker-entrypoint.sh
+++ b/docker-entrypoint.sh
@@ -5,9 +5,12 @@ set -e
 data_init="/app/data_init"
 data="/app/data"
 
+ls $data
 # Merge data_init into data without overwrites.
-# cp -R -n "$data_init/." "$data/"
-cp -R "$data_init/." "$data/"
+cp -R -n $data_init/* $data
+cp -n "$data_init/creds_example.yml" "$data/creds.yml"
+
+ls $data
 
 echo "Yt-dlp update"
 # TODO: Update yt-dlp. It should not crash the entrypoint if ca-certificates is not installed