From a200a527ed218e8c05cf5588b5d42c3680556891 Mon Sep 17 00:00:00 2001 From: Alexandre Date: Sat, 27 Apr 2024 11:24:19 +0200 Subject: [PATCH] Avoid hardcode pi --- zzz_draft_birdnet-pi/Dockerfile | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/zzz_draft_birdnet-pi/Dockerfile b/zzz_draft_birdnet-pi/Dockerfile index 294c9665b..36b569665 100644 --- a/zzz_draft_birdnet-pi/Dockerfile +++ b/zzz_draft_birdnet-pi/Dockerfile @@ -42,14 +42,14 @@ RUN \ # Change user to pi and create /home/pi echo "setting users" && \ groupmod -o -g 101 abc && usermod -o -u 101 abc && \ - groupadd --non-unique -g 1000 pi && \ - useradd --non-unique --uid 1000 --gid 1000 -m pi && \ + groupadd --non-unique -g 1000 "$USER" && \ + useradd --non-unique --uid 1000 --gid 1000 -m "$USER" && \ \ # Ensure permissions echo "setting permissions" && \ - echo "pi ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers && \ - mkdir -p /home/pi/.config/matplotlib && \ - chown -R 1000:1000 /home/pi && \ + echo "$USER ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers && \ + mkdir -p "$HOME"/.config/matplotlib && \ + chown -R 1000:1000 "$HOME" && \ \ # Download installer curl -f -L -s -S "https://raw.githubusercontent.com/Nachtzuster/BirdNET-Pi/main/newinstaller.sh" -o /newinstaller.sh && \ @@ -80,12 +80,12 @@ RUN \ #sed -i -e "s|== 0|== 7|g" -e "s|sudo -n true|true|g" -e "s|sudo -K|true|g" /newinstaller.sh && \ \ # Execute installer - sudo -u pi /./newinstaller.sh && \ + sudo -u "$USER" /./newinstaller.sh && \ \ # Adapt for lsio usage of /app if [ -d /app ]; then rm -r /app; fi && \ - ln -s /home/pi /app && \ - chown -R 1000:1000 /home/pi /app + ln -s "$HOME" /app && \ + chown -R 1000:1000 "$HOME" /app ################## # 2 Modify Image #