From 5d01ca90194ff8b74dbb176c339e4ab7549dd75d Mon Sep 17 00:00:00 2001 From: Tony Miller Date: Thu, 13 Jul 2023 11:16:03 -0700 Subject: [PATCH] try latest git of liquidsoap --- liquidsoap/Dockerfile | 18 +++++++++--------- liquidsoap/radio.liq | 10 +++++----- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/liquidsoap/Dockerfile b/liquidsoap/Dockerfile index 819ba99..07672c5 100644 --- a/liquidsoap/Dockerfile +++ b/liquidsoap/Dockerfile @@ -28,20 +28,20 @@ WORKDIR /home/liquidsoap RUN sudo touch /var/log/liquidsoap.log RUN sudo chown liquidsoap:users /var/log/liquidsoap.log -RUN opam switch create 4.13.1 +RUN opam switch create 4.14.0 RUN opam update # depext no longer required to install, integrated with opam # RUN opam install depext -y # RUN opam depext taglib mad lame ogg vorbis cry samplerate liquidsoap -y -RUN opam install taglib mad lame ogg vorbis cry samplerate ocurl liquidsoap -y - -# RUN for i in ocaml-gavl ocaml-ffmpeg ocaml-dtools ocaml-duppy ocaml-mm ocaml-cry ocaml-taglib ocaml-lame ocaml-mad ocaml-ogg ocaml-vorbis ocaml-samplerate; do \ -# cd /home/liquidsoap && git clone https://github.com/savonet/$i && cd $i && opam pin add --yes --no-action .; \ -# done -# RUN cd /home/liquidsoap && git clone https://github.com/savonet/liquidsoap && cd liquidsoap && git checkout v2.0.0 && opam pin add --yes --no-action . -#RUN cd /home/liquidsoap && git clone https://github.com/savonet/liquidsoap && cd liquidsoap && opam pin add --yes --no-action . -# RUN opam install --yes liquidsoap ffmpeg cry taglib lame mad ogg vorbis samplerate +# RUN opam install taglib mad lame ogg vorbis cry samplerate ocurl liquidsoap -y + +RUN for i in ocaml-gavl ocaml-ffmpeg ocaml-dtools ocaml-duppy ocaml-mm ocaml-cry ocaml-metadata ocaml-taglib ocaml-lame ocaml-mad ocaml-ogg ocaml-vorbis ocaml-samplerate; do \ + opam pin --yes git+https://github.com/savonet/$i; \ +done +# RUN cd /home/liquidsoap && git clone https://github.com/savonet/liquidsoap && cd liquidsoap && git checkout rolling-release-2.2.x && opam pin add --yes --no-action . +RUN cd /home/liquidsoap && git clone https://github.com/savonet/liquidsoap && cd liquidsoap && opam pin add --yes --no-action . +RUN opam install --yes liquidsoap ffmpeg cry taglib lame mad ogg vorbis samplerate # RUN eval $(opam env) && liquidsoap --version diff --git a/liquidsoap/radio.liq b/liquidsoap/radio.liq index 70c18f1..eb8093d 100755 --- a/liquidsoap/radio.liq +++ b/liquidsoap/radio.liq @@ -15,16 +15,16 @@ set("server.socket.path","/home/liquidsoap/tracks/liquidsoap.sock") set("harbor.bind_addrs",["0.0.0.0"]) # needs these env variables -radio_name = getenv("RADIO_NAME") +radio_name = environment.get("RADIO_NAME") icecast_host = "icecast" icecast_port = "8000" -crossfade_enabled = getenv("CROSSFADE") +crossfade_enabled = environment.get("CROSSFADE") # tunein_partner_id = getenv("TUNEIN_PARTNER_ID") # tunein_partner_key = getenv("TUNEIN_PARTNER_KEY") # tunein_station_id = getenv("TUNEIN_STATION_ID") # tunein_metadata_updates_enabled = getenv("TUNEIN_METADATA_UPDATES_ENABLED") -stereo_tool_key = getenv("STEREO_TOOL_KEY") +stereo_tool_key = environment.get("STEREO_TOOL_KEY") # liq_secret = getenv("LIQ_SECRET") @@ -274,12 +274,12 @@ source = server.insert_metadata(id="fallback", source) output.icecast(%vorbis,id="icecast", mount="#{radio_name}.ogg", host=icecast_host, port=int_of_string(icecast_port), password="hackme", - icy_metadata="true",description="", + send_icy_metadata=true,description="", url="", encoding="UTF-8", mksafe(buffer(source))) output.icecast(%mp3,id="icecast", mount="#{radio_name}.mp3", host=icecast_host, port=int_of_string(icecast_port), password="hackme", - icy_metadata="true",description="", + send_icy_metadata=true,description="", url="", encoding="UTF-8", mksafe(buffer(source)))