mirror of
https://github.com/m1k1o/neko.git
synced 2026-11-03 08:21:50 -06:00
chore: upgrade Go version to 1.25.
This commit is contained in:
@@ -323,6 +323,6 @@ docker run --rm -i \
|
|||||||
-e "RUNTIME_DOCKERFILE=$RUNTIME_DOCKERFILE" \
|
-e "RUNTIME_DOCKERFILE=$RUNTIME_DOCKERFILE" \
|
||||||
--workdir /src \
|
--workdir /src \
|
||||||
--entrypoint go \
|
--entrypoint go \
|
||||||
golang:1.24-trixie \
|
golang:1.25-trixie \
|
||||||
run utils/docker/main.go \
|
run utils/docker/main.go \
|
||||||
-i Dockerfile.tmpl -client "$CLIENT_DIST" | build_image $BASE_IMAGE -f - .
|
-i Dockerfile.tmpl -client "$CLIENT_DIST" | build_image $BASE_IMAGE -f - .
|
||||||
|
|||||||
+82
-10
@@ -1,14 +1,86 @@
|
|||||||
|
networks:
|
||||||
|
neko_net:
|
||||||
|
driver: bridge
|
||||||
|
|
||||||
services:
|
services:
|
||||||
neko:
|
neko:
|
||||||
image: "ghcr.io/m1k1o/neko/firefox:latest"
|
image: ghcr.io/m1k1o/neko/intel-firefox:latest
|
||||||
restart: "unless-stopped"
|
container_name: neko
|
||||||
shm_size: "2gb"
|
restart: unless-stopped
|
||||||
|
shm_size: 4gb
|
||||||
|
cap_add:
|
||||||
|
- SYS_ADMIN
|
||||||
|
devices:
|
||||||
|
- /dev/dri:/dev/dri
|
||||||
|
networks:
|
||||||
|
- neko_net
|
||||||
ports:
|
ports:
|
||||||
- "8080:8080"
|
- "80:8080" # Web interface
|
||||||
- "52000-52100:52000-52100/udp"
|
- "52000-52100:52000-52100/udp" # WebRTC
|
||||||
environment:
|
environment:
|
||||||
NEKO_DESKTOP_SCREEN: 1920x1080@30
|
TZ: "Europe/Berlin"
|
||||||
NEKO_MEMBER_MULTIUSER_USER_PASSWORD: neko
|
NEKO_HWENC: "none"
|
||||||
NEKO_MEMBER_MULTIUSER_ADMIN_PASSWORD: admin
|
NEKO_SERVER_PROXY: "true"
|
||||||
NEKO_WEBRTC_EPR: 52000-52100
|
# ---- WebRTC ----
|
||||||
NEKO_WEBRTC_ICELITE: 1
|
NEKO_WEBRTC_NAT1TO1: 10.220.1.238
|
||||||
|
NEKO_WEBRTC_EPR: "52000-52100"
|
||||||
|
NEKO_WEBRTC_ICELITE: "true"
|
||||||
|
# ---- Desktop ----
|
||||||
|
NEKO_DESKTOP_SCREEN: "1920x1080@30"
|
||||||
|
# ---- Auth ----
|
||||||
|
NEKO_MEMBER_MULTIUSER_USER_PASSWORD: "changeMe"
|
||||||
|
NEKO_MEMBER_MULTIUSER_ADMIN_PASSWORD: "changeMe"
|
||||||
|
NEKO_SESSION_CONTROL_PROTECTION: "true"
|
||||||
|
# ---- Capture pipelines ----
|
||||||
|
NEKO_CAPTURE_VIDEO_CODEC: "h264"
|
||||||
|
NEKO_CAPTURE_BROADCAST_URL: "placeholder" # No need to chance this line, it's handled by NEKO_CAPTURE_BROADCAST_PIPELINE. It's only needed to be filled so it's possible to start the Broadcast
|
||||||
|
NEKO_CAPTURE_BROADCAST_AUTOSTART: "false"
|
||||||
|
NEKO_CAPTURE_BROADCAST_PIPELINE: >
|
||||||
|
ximagesrc display-name={display} show-pointer=true use-damage=false !
|
||||||
|
queue !
|
||||||
|
videoconvert ! videorate ! videoscale !
|
||||||
|
video/x-raw,width=1920,height=1080,framerate=25/1 !
|
||||||
|
x264enc speed-preset=ultrafast tune=zerolatency !
|
||||||
|
h264parse !
|
||||||
|
queue !
|
||||||
|
mux.video
|
||||||
|
|
||||||
|
pulsesrc device=audio_output.monitor !
|
||||||
|
queue !
|
||||||
|
audioconvert ! audioresample !
|
||||||
|
audio/x-raw,channels=2 !
|
||||||
|
voaacenc bitrate=320000 !
|
||||||
|
aacparse !
|
||||||
|
queue !
|
||||||
|
mux.audio
|
||||||
|
|
||||||
|
hlssink2
|
||||||
|
name=mux
|
||||||
|
max-files=5
|
||||||
|
playlist-length=5
|
||||||
|
target-duration=1
|
||||||
|
location=/var/www/live/segment-%d.ts
|
||||||
|
playlist-location=/var/www/live/index.m3u8
|
||||||
|
|
||||||
|
mediamtx:
|
||||||
|
image: bluenviron/mediamtx:latest-ffmpeg
|
||||||
|
container_name: mediamtx
|
||||||
|
restart: unless-stopped
|
||||||
|
networks:
|
||||||
|
- neko_net
|
||||||
|
ports:
|
||||||
|
- "8554:8554" # RTSP output e.g. rtsp://server-ip:8555/live (RTSP playback doesn't work for Standalone Headsets, only for PC)
|
||||||
|
- "8888:8888" # HLS output e.g. http://server-ip:8889/live/index.m3u8, https://domain.tld/live/index.m3u8
|
||||||
|
environment:
|
||||||
|
MEDIAMTX_RTSPTRANSPORTS: "tcp"
|
||||||
|
# Audio encoder (force stereo)
|
||||||
|
MTX_PATHS_LIVE_HLS_AUDIO_ENCODER: "aac"
|
||||||
|
MTX_PATHS_LIVE_HLS_AUDIO_ENCODER_ARGS: "audio_bitrate=320k,channels=2"
|
||||||
|
# ---- Optimized STANDARD HLS (NOT LL-HLS) ----
|
||||||
|
MTX_HLSMODE: "muxer"
|
||||||
|
MTX_HLSVARIANT: "mpegts"
|
||||||
|
MTX_HLSALWAYSREMUX: "yes"
|
||||||
|
MTX_HLSSEGMENTDURATION: "1s" # 1 second segments
|
||||||
|
MTX_HLSSEGMENTCOUNT: "4" # ~4s real latency
|
||||||
|
# ---- Neko Broadcast Source ----
|
||||||
|
MTX_PATHS_LIVE_SOURCE: "udp://mediamtx:1234?pkt_size=1316"
|
||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
ARG BASE_IMAGE=golang:1.24-trixie
|
ARG BASE_IMAGE=golang:1.25-trixie
|
||||||
FROM $BASE_IMAGE AS server
|
FROM $BASE_IMAGE AS server
|
||||||
|
|
||||||
WORKDIR /src
|
WORKDIR /src
|
||||||
|
|||||||
+1
-3
@@ -1,8 +1,6 @@
|
|||||||
module github.com/m1k1o/neko/server
|
module github.com/m1k1o/neko/server
|
||||||
|
|
||||||
go 1.24.0
|
go 1.25.0
|
||||||
|
|
||||||
toolchain go1.24.5
|
|
||||||
|
|
||||||
require (
|
require (
|
||||||
github.com/PaesslerAG/gval v1.2.4
|
github.com/PaesslerAG/gval v1.2.4
|
||||||
|
|||||||
+1
-1
@@ -1,3 +1,3 @@
|
|||||||
module github.com/m1k1o/neko/utils/docker
|
module github.com/m1k1o/neko/utils/docker
|
||||||
|
|
||||||
go 1.24.1
|
go 1.25.1
|
||||||
|
|||||||
Reference in New Issue
Block a user