From 95b6c032c4568fba6d10f45e847d713495f0ffef Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Wed, 26 Jun 2024 14:12:58 +0200 Subject: [PATCH] Add PR --- birdnet-pi/Dockerfile | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/birdnet-pi/Dockerfile b/birdnet-pi/Dockerfile index 8a3e13a4e..9a2914bf9 100644 --- a/birdnet-pi/Dockerfile +++ b/birdnet-pi/Dockerfile @@ -99,6 +99,35 @@ RUN \ apt-get clean all && \ rm -rf /var/lib/apt/lists/* +# Add temporary code +RUN cd $HOME/BirdNET-Pi && \ + git reset --hard && \ + # Species whitelist + git fetch origin pull/110/head:bb && \ + # Improve darkmode + git fetch origin pull/115/head:aa && \ + # Updated UI + git fetch origin pull/116/head:cc && \ + # Disk usage + git fetch origin pull/121/head:dd && \ + git checkout main && \ + git checkout -b f-merge-prs && \ + git merge aa --no-edit && \ + git stash && \ + git merge bb --no-edit && \ + git stash && \ + git merge cc --no-edit && \ + git stash && \ + git merge dd --no-edit && \ + git stash && \ + git checkout main && \ + git merge f-merge-prs && \ + git branch -d aa && \ + git branch -d bb && \ + git branch -d cc && \ + git branch -d dd && \ + git branch -d f-merge-prs + ################## # 2 Modify Image # ##################