diff --git a/docker/main/install_deps.sh b/docker/main/install_deps.sh index 61ece1b76..2873f3999 100755 --- a/docker/main/install_deps.sh +++ b/docker/main/install_deps.sh @@ -76,10 +76,4 @@ fi apt-get purge gnupg apt-transport-https xz-utils -y apt-get clean autoclean -y apt-get autoremove --purge -y -rm -rf /var/lib/apt/lists/* - -# Install yq, for frigate-prepare and go2rtc echo source -curl -fsSL \ - "https://github.com/mikefarah/yq/releases/download/v4.33.3/yq_linux_$(dpkg --print-architecture)" \ - --output /usr/local/bin/yq -chmod +x /usr/local/bin/yq +rm -rf /var/lib/apt/lists/* \ No newline at end of file diff --git a/docker/main/rootfs/etc/s6-overlay/s6-rc.d/frigate/run b/docker/main/rootfs/etc/s6-overlay/s6-rc.d/frigate/run index f2cc40fcf..a06b55cbe 100755 --- a/docker/main/rootfs/etc/s6-overlay/s6-rc.d/frigate/run +++ b/docker/main/rootfs/etc/s6-overlay/s6-rc.d/frigate/run @@ -21,9 +21,9 @@ function migrate_db_path() { fi unset config_file_yaml - # Use yq to check if database.path is set + # check if database.path is set local user_db_path - user_db_path=$(yq eval '.database.path' "${config_file}") + user_db_path=$(python3 -c "import yaml, json; data = json.loads(json.dumps(yaml.safe_load(open('${config_file}')))); print(data['database']['path']) if 'database' in data and 'path' in data['database'] else print('null')") if [[ "${user_db_path}" == "null" ]]; then local previous_db_path="/media/frigate/frigate.db"