1
0
Fork 0

Compare commits

..

No commits in common. "0356616566efda392ae5873666f526bcad1a0f71" and "130c33799bfe1c11d5677f5117b734d26a4ef678" have entirely different histories.

2 changed files with 25 additions and 14 deletions

View File

@ -1,18 +1,18 @@
settings.log.stdout := true set("log.stdout", true)
settings.log.file := false set("log.file", false)
settings.log.level := 4 set("log.level", 4)
settings.server.telnet := true set("server.telnet", true)
settings.server.telnet.bind_addr := "127.0.0.1" set("server.telnet.bind_addr", "127.0.0.1")
settings.server.telnet.port := 21337 set("server.telnet.port", 21337)
settings.init.allow_root := true set("init.allow_root",true)
settings.frame.video.width := 1920 set("frame.video.width", 1920)
settings.frame.video.height := 1080 set("frame.video.height", 1080)
settings.audio.converter.samplerate.libsamplerate.quality := "best" set("audio.converter.samplerate.libsamplerate.quality", "best")
settings.audio.converter.samplerate.native.quality := "linear" set("audio.converter.samplerate.native.quality","linear")
settings.sandbox := false set("sandbox", "disabled")
%include "settings.liq" %include "settings.liq"
%include "metadata_api.liq" %include "metadata_api.liq"
@ -124,6 +124,7 @@ setup_harbor_stream_api(internal_icecast(
mount="/outa/mp3_128", mount="/outa/mp3_128",
start=false, start=false,
format="audio/mpeg", format="audio/mpeg",
encoding="ISO-8859-1",
%ffmpeg( %ffmpeg(
format="mp3", format="mp3",
%audio( %audio(

View File

@ -268,9 +268,9 @@ COPY --from=ffmpeg-ndi /usr/src/ffmpeg-ndi/*.pkg.* /packages/
COPY --from=fakesilence /usr/local/bin/fakesilence /target/usr/local/bin/ COPY --from=fakesilence /usr/local/bin/fakesilence /target/usr/local/bin/
### ###
# FINAL IMAGE # PACKAGE INSTALL
FROM base AS final-image FROM base AS install
USER root USER root
# COPY --from=powerpill /usr/src/powerpill/*.pkg.* /tmp/ # COPY --from=powerpill /usr/src/powerpill/*.pkg.* /tmp/
@ -296,6 +296,16 @@ COPY --from=fakesilence /usr/local/bin/fakesilence /usr/local/bin/
COPY --from=files /target/ / COPY --from=files /target/ /
RUN rm -rf /var/cache/pacman/pkg/*
###
# FINAL IMAGE
FROM base AS final-image
# squash all the package installation into a single
COPY --from=install / /
RUN useradd -m -u 1000 -G wheel,realtime,audio,video ndi-feeder RUN useradd -m -u 1000 -G wheel,realtime,audio,video ndi-feeder
RUN echo "ndi-feeder:ndi-feeder" | chpasswd RUN echo "ndi-feeder:ndi-feeder" | chpasswd