Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

try latest git of liquidsoap #31

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions liquidsoap/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
10 changes: 5 additions & 5 deletions liquidsoap/radio.liq
Original file line number Diff line number Diff line change
Expand Up @@ -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")

Expand Down Expand Up @@ -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)))