From 3791738c41ff6542947a784324ab32d94222b042 Mon Sep 17 00:00:00 2001 From: Guillermo Marcel Date: Thu, 20 Feb 2025 15:17:46 -0300 Subject: [PATCH] fix: extract linux support to docker file --- src/CasaBot/CasaBotApp/Dockerfile | 1 + .../CasaBotApp/appsettings.Docker.json | 37 +++++++++++++++++++ src/CasaBot/CasaBotApp/appsettings.json | 8 +--- 3 files changed, 40 insertions(+), 6 deletions(-) create mode 100644 src/CasaBot/CasaBotApp/appsettings.Docker.json diff --git a/src/CasaBot/CasaBotApp/Dockerfile b/src/CasaBot/CasaBotApp/Dockerfile index 0c3ffc8..037ccd0 100644 --- a/src/CasaBot/CasaBotApp/Dockerfile +++ b/src/CasaBot/CasaBotApp/Dockerfile @@ -32,5 +32,6 @@ RUN apt-get install -y python3 python3-pip RUN python3 -m pip install dvr-scan[opencv-headless] --break-system-packages COPY --link --from=build /app . +COPY CasaBotApp/appsettings.Docker.json ./appsettings.json ENTRYPOINT ["dotnet", "CasaBotApp.dll"] #CMD ["/bin/bash"] \ No newline at end of file diff --git a/src/CasaBot/CasaBotApp/appsettings.Docker.json b/src/CasaBot/CasaBotApp/appsettings.Docker.json new file mode 100644 index 0000000..7a559bd --- /dev/null +++ b/src/CasaBot/CasaBotApp/appsettings.Docker.json @@ -0,0 +1,37 @@ +{ + "Logging": { + "LogLevel": { + "Default": "Debug", + "System": "Information", + "Microsoft": "Information", + "Quartz": "Information", + "System.Net.Http.HttpClient": "Warning" + } + }, + "Telegram":{ + "BotToken": "__token__", + "SubscribedChatIds": [] + }, + "Shinobi": { + "URL": "http://localhost:8080", + "APIKey": "APIKEY", + "GroupId": "Group", + "MonitorId": "Monitor" + }, + "AutoScan": { + "Enabled": true, + "RunDry": false, + "At": "07:00", + "FromDayBefore": false, + "From": "01:00", + "To": "05:00", + "MaxAmount": 0, + "MediaFolder": "./media/originals/", + "Scanner": { + "Exe": "dvr-scan", + "ConfigFile": "./dvr-scan.cfg", + "DetectionFolder": "./media/detections/", + "RunDry": false + } + } +} \ No newline at end of file diff --git a/src/CasaBot/CasaBotApp/appsettings.json b/src/CasaBot/CasaBotApp/appsettings.json index 96a6014..33bb912 100644 --- a/src/CasaBot/CasaBotApp/appsettings.json +++ b/src/CasaBot/CasaBotApp/appsettings.json @@ -29,12 +29,8 @@ "MaxAmount": 0, "MediaFolder": "./media/originals/", "Scanner": { - "ExeLinux": "dvr-scan", - "ExeWindows": "./dvr-scanner/dvr-scan.exe", - "Exe": "dvr-scan", - "ConfigFileLinux": "./dvr-scan.cfg", - "ConfigFileWindows": "./dvr-scanner/dvr-scan.cfg", - "ConfigFile": "./dvr-scan.cfg", + "Exe": "./dvr-scanner/dvr-scan.exe", + "ConfigFile": "./dvr-scanner/dvr-scan.cfg", "DetectionFolder": "./media/detections/", "RunDry": false }