Skip to content

Commit

Permalink
Wait longer and update to latest acestream engine (#45)
Browse files Browse the repository at this point in the history
  • Loading branch information
blaise-io authored Jan 28, 2022
1 parent f1755b5 commit 78c5453
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 7 deletions.
2 changes: 1 addition & 1 deletion Ace Link/Services/StreamPeers.swift
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ private struct GetStatsResponse: Decodable {
class StreamPeers: Service {
let statURL: URL

override var maxWait: DispatchTimeInterval { DispatchTimeInterval.seconds(30) }
override var maxWait: DispatchTimeInterval { DispatchTimeInterval.seconds(90) }
override var defaultError: String { "Stream does not have peers." }

init(statURL: URL) {
Expand Down
21 changes: 16 additions & 5 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
# syntax=docker/dockerfile:experimental
FROM ubuntu:16.04
FROM ubuntu:bionic

# Install system packages
RUN set -ex && \
apt-get update && \
apt-get install -yq --no-install-recommends \
ca-certificates \
python2.7 \
libpython2.7 \
net-tools \
Expand All @@ -19,12 +20,22 @@ RUN set -ex && \
# Install Ace Stream
# https://wiki.acestream.media/Download#Linux
RUN mkdir -p /opt/acestream && \
wget --quiet --output-document acestream.tgz "http://download.acestream.media/linux/acestream_3.1.16_ubuntu_16.04_x86_64.tar.gz" && \
echo "452bccb8ae8b5ff4497bbb796081dcf3fec2b699ba9ce704107556a3d6ad2ad7 acestream.tgz" | sha256sum --check && \
tar --extract --gzip --strip-components 1 --directory /opt/acestream --file acestream.tgz && \
wget --no-verbose --output-document acestream.tgz "https://download.acestream.media/linux/acestream_3.1.49_ubuntu_18.04_x86_64.tar.gz" && \
echo "d2ed7bdc38f6a47c05da730f7f6f600d48385a7455d922a2688f7112202ee19e acestream.tgz" | sha256sum --check && \
tar --extract --gzip --directory /opt/acestream --file acestream.tgz && \
rm -rf acestream.tgz && \
/opt/acestream/start-engine --version

# Acestream 3.1.49 install is missing library files,
# but we can grab these from a previous release.
# http://oldforum.acestream.media/index.php?topic=12448.msg26872
RUN wget --no-verbose --output-document acestream.tgz "https://download.acestream.media/linux/acestream_3.1.16_ubuntu_16.04_x86_64.tar.gz" && \
echo "452bccb8ae8b5ff4497bbb796081dcf3fec2b699ba9ce704107556a3d6ad2ad7 acestream.tgz" | sha256sum --check && \
tar --extract --gzip --strip-components 1 --directory /tmp --file acestream.tgz && \
cp /tmp/lib/acestreamengine/py*.so /opt/acestream/lib/acestreamengine/ && \
cp /tmp/lib/*.so* /usr/lib/x86_64-linux-gnu/ && \
rm -rf tmp/* acestream.tgz

# Overwrite disfunctional Ace Stream web player with a working videojs player,
# Access at http://127.0.0.1:6878/webui/player/<acestream id>
COPY player.html /opt/acestream/data/webui/html/player.html
Expand All @@ -38,4 +49,4 @@ ENTRYPOINT ["/opt/acestream/start-engine", "@/opt/acestream/acestream.conf"]
HEALTHCHECK CMD nc -zv localhost 6878 || exit 1

EXPOSE 6878
EXPOSE 8621
EXPOSE 8621
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.0.0
2.0.1

0 comments on commit 78c5453

Please sign in to comment.