administrator/frigate
1
0
Fork 0
mirror of https://github.com/blakeblackshear/frigate.git synced 2026-02-03 17:55:21 +03:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Integrate with newest changes

Browse Source
This commit is contained in:
Felipe Santos 2023-01-16 23:21:34 -03:00
parent 21cd553fda
commit fc43109f3a
3 changed files with 44 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
docker/rootfs/etc/cont-init.d/prepare-go2rtc.sh
View File

@ -4,10 +4,8 @@
set -o errexit -o nounset -o pipefail set -o errexit -o nounset -o pipefail
if [[ -z "${SUPERVISOR_TOKEN:-}" ]]; then if [[ -n "${SUPERVISOR_TOKEN:-}" ]]; then
# Not running as a Home Assistant add-on, don't do anything # Running as a Home Assistant add-on, infer the IP address and port
exit 0
fi
# Example: 192.168.1.10/24 # Example: 192.168.1.10/24
ip_regex='^([0-9]{1,3}\.{3}[0-9]{1,3})/[0-9]{1,2}$' ip_regex='^([0-9]{1,3}\.{3}[0-9]{1,3})/[0-9]{1,2}$'
@ -22,8 +20,6 @@ if ip_address=$(
echo "Got IP address from supervisor: ${ip_address}" >&2 echo "Got IP address from supervisor: ${ip_address}" >&2
else else
echo "Failed to get IP address from supervisor" >&2 echo "Failed to get IP address from supervisor" >&2
# Exit with success so that the container can still start
exit 0
fi fi
port_regex='^([0-9]{1,5})$' port_regex='^([0-9]{1,5})$'
@ -32,16 +28,15 @@ if webrtc_port=$(
-H "Authorization: Bearer ${SUPERVISOR_TOKEN}" \ -H "Authorization: Bearer ${SUPERVISOR_TOKEN}" \
-H "Content-Type: application/json" \ -H "Content-Type: application/json" \
http://supervisor/addons/self/info | http://supervisor/addons/self/info |
jq --exit-status --raw-output '.data.network["8555/tcp"]' jq --exit-status --raw-output '.data.network["22/tcp"]'
) && [[ "${webrtc_port}" =~ ${port_regex} ]]; then ) && [[ "${webrtc_port}" =~ ${port_regex} ]]; then
webrtc_port="${BASH_REMATCH[1]}" webrtc_port="${BASH_REMATCH[1]}"
echo "Got WebRTC port from supervisor: ${ip_address}" >&2 echo "Got WebRTC port from supervisor: ${ip_address}" >&2
else else
echo "Failed to get WebRTC port from supervisor" >&2 echo "Failed to get WebRTC port from supervisor" >&2
# Exit with success so that the container can still start
exit 0
fi fi
# Replace the IP address in the config export FRIGATE_GO2RTC_WEBRTC_CANDIDATE_INTERNAL="${ip_address}:${webrtc_port}"
candidate="${ip_address}:${webrtc_port}" fi
sed --in-place "s/# - %%CANDIDATE%%/- ${candidate}/" /usr/local/go2rtc/go2rtc.yaml
python3 /usr/local/go2rtc/create_config.py > /dev/shm/go2rtc.yaml

6
docker/rootfs/etc/services.d/go2rtc/run
View File

@ -2,10 +2,6 @@
# shellcheck shell=bash # shellcheck shell=bash
# Start the go2rtc service # Start the go2rtc service
set -o errexit -o nounset -o pipefail
raw_config=$(python3 /usr/local/go2rtc/create_config.py)
# Replace the bash process with the go2rtc process, redirecting stderr to stdout # Replace the bash process with the go2rtc process, redirecting stderr to stdout
exec 2>&1 exec 2>&1
exec go2rtc -config="${raw_config}" exec go2rtc -config=/dev/shm/go2rtc.yaml

10
docker/rootfs/usr/local/go2rtc/create_config.py
View File

@ -25,7 +25,15 @@ go2rtc_config: dict[str, any] = config["go2rtc"]
if not go2rtc_config.get("log", {}).get("format"): if not go2rtc_config.get("log", {}).get("format"):
go2rtc_config["log"] = {"format": "text"} go2rtc_config["log"] = {"format": "text"}
default_candidates = []
# Use FRIGATE_GO2RTC_WEBRTC_CANDIDATE_INTERNAL as candidate if set
if os.environ.get("FRIGATE_GO2RTC_WEBRTC_CANDIDATE_INTERNAL"):
default_candidates.append(
os.environ['FRIGATE_GO2RTC_WEBRTC_CANDIDATE_INTERNAL']
)55
default_candidates.append("stun:85")
if not go2rtc_config.get("webrtc", {}).get("candidates", []): if not go2rtc_config.get("webrtc", {}).get("candidates", []):
go2rtc_config["webrtc"] = {"candidates": ["stun:8555"]} go2rtc_config["webrtc"] = {"candidates": default_candidates}
print(json.dumps(go2rtc_config)) print(json.dumps(go2rtc_config))