From ceaa18258775e1ae345baf6f3f35bda64bde5e16 Mon Sep 17 00:00:00 2001
From: Pedro Pombeiro <noreply@pedro.pombei.ro>
Date: Fri, 11 Oct 2024 18:21:26 +0200
Subject: [PATCH] Fix API usage when NAME variable is customized

---
 Dockerfile | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 88c3bc1..1d86794 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -37,20 +37,9 @@ COPY files/runScanner.sh /opt/brother/runScanner.sh
 COPY files/brscan-skey.config /opt/brother/scanner/brscan-skey/brscan-skey.config
 COPY script /opt/brother/scanner/brscan-skey/script
 
-RUN <<EOF
-cp /etc/lighttpd/conf-available/05-auth.conf /etc/lighttpd/conf-enabled/ && \
-cp /etc/lighttpd/conf-available/15-fastcgi-php.conf /etc/lighttpd/conf-enabled/ && \
-cp /etc/lighttpd/conf-available/10-fastcgi.conf /etc/lighttpd/conf-enabled/ && \
-mkdir -p /var/run/lighttpd && \
-touch /var/run/lighttpd/php-fastcgi.socket && \
-chown -R www-data /var/run/lighttpd && \
-echo 'www-data ALL=(NAS) NOPASSWD:ALL' >> /etc/sudoers
-EOF
-
 ENV NAME="Scanner"
 ENV MODEL="MFC-L2700DW"
 ENV IPADDRESS="192.168.1.123"
-ENV USERNAME="NAS"
 ENV REMOVE_BLANK_THRESHOLD="0.3"
 
 # Only set these variables in the compose file, if inotify needs to be triggered (e.g., for Synology Drive):
@@ -71,6 +60,16 @@ ENV TELEGRAM_CHATID=""
 # Make sure this ends in a slash.
 ENV FTP_PATH="/scans/"
 
+RUN <<EOF
+cp /etc/lighttpd/conf-available/05-auth.conf /etc/lighttpd/conf-enabled/ && \
+cp /etc/lighttpd/conf-available/15-fastcgi-php.conf /etc/lighttpd/conf-enabled/ && \
+cp /etc/lighttpd/conf-available/10-fastcgi.conf /etc/lighttpd/conf-enabled/ && \
+mkdir -p /var/run/lighttpd && \
+touch /var/run/lighttpd/php-fastcgi.socket && \
+chown -R www-data /var/run/lighttpd && \
+echo "www-data ALL=($NAME) NOPASSWD:ALL" >> /etc/sudoers
+EOF
+
 #ADD files/gui/index.php /var/www/html
 #ADD files/gui/main.css /var/www/html
 #ADD files/api/scan.php /var/www/html