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

Raspi arm 64 Volume mapping is not working #31

Open
wants to merge 135 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
135 commits
Select commit Hold shift + click to select a range
a7d26f6
Update Serviio version to 2.2.1
soerentsch Dec 16, 2021
1b557a1
Cleanup Source URLs
soerentsch Dec 17, 2021
5533ca2
Update Readme
soerentsch Dec 17, 2021
35513f5
Fix yaml
soerentsch Dec 17, 2021
9342260
Fix dcraw.c
soerentsch Dec 17, 2021
9b561f4
Update README.md
soerentsch Dec 20, 2021
6b20b89
Delete .github directory
soerentsch Dec 20, 2021
17332b1
Delete docker-compose.yml
soerentsch Dec 20, 2021
1a69b03
Delete Dockerfile.debian
soerentsch Dec 20, 2021
7393d14
Delete hooks directory
soerentsch Dec 20, 2021
718c92b
Update README.md
soerentsch Dec 20, 2021
30fef01
Update Dockerfile
soerentsch Dec 30, 2021
b7375a8
Update README.md
soerentsch Jan 14, 2022
8a6d2a0
Update to FFmpeg 5.0
soerentsch Jan 24, 2022
798af54
fix alpine repo url
soerentsch Jan 26, 2022
73b859c
Update README.md
soerentsch Jan 26, 2022
590dbc3
Update docker-compose.yml
soerentsch Jan 26, 2022
59e52c2
update source urls from http to https
soerentsch Jan 26, 2022
9300b15
Update to Jasper 3.0.0
soerentsch Feb 9, 2022
4c1213c
FFmpeg build flag fixed
soerentsch Feb 9, 2022
eaef55c
Merge branch 'dockerhub' of https://github.com/soerentsch/docker-serv…
soerentsch Feb 9, 2022
dff7d67
Update README.md
soerentsch Feb 10, 2022
1046d44
Update Jasper to 3.0.1
soerentsch Feb 14, 2022
5159160
Merge branch 'dockerhub' of https://github.com/soerentsch/docker-serv…
soerentsch Feb 14, 2022
455bd1c
Update README.md
soerentsch Feb 14, 2022
998e703
Update README.md
soerentsch Feb 14, 2022
d4876fc
Merge branch 'dockerhub' of https://github.com/soerentsch/docker-serv…
soerentsch Feb 16, 2022
bcc52c8
Update Jasper to 3.0.2
soerentsch Feb 16, 2022
41310a1
Update to Jasper 3.0.3
soerentsch Mar 16, 2022
c7d63f0
Update README.md
soerentsch Apr 12, 2022
85908d3
Update alpine to 3.15.4
soerentsch Apr 12, 2022
dc21a36
Added alpine edge branche
soerentsch Apr 13, 2022
626949e
Update README.md
soerentsch Apr 14, 2022
55e3bbd
Update README.md
soerentsch Apr 22, 2022
53497d2
Update README.md
soerentsch Apr 23, 2022
2f8aba9
Update README.md
soerentsch Apr 27, 2022
945206a
Update README.md
soerentsch Apr 27, 2022
95f7b2d
CleanUp inspired by danie1k/docker-serviio
soerentsch May 2, 2022
c650569
Update README.md
soerentsch May 2, 2022
81af7f3
CleanUp inspired by danie1k/docker-serviio
soerentsch May 2, 2022
6e3ce16
Merge branch 'dockerhub' of https://github.com/soerentsch/docker-serv…
soerentsch May 2, 2022
4bdfe34
CleanUp inspired by danie1k/docker-serviio
soerentsch May 2, 2022
628b316
CleanUp inspired by danie1k/docker-serviio
soerentsch May 2, 2022
0257513
Update Dockerfile
soerentsch May 3, 2022
9e0cec7
Cleanup Dockerfile
soerentsch May 4, 2022
c8dce4f
Update README.md
soerentsch May 4, 2022
fb396fb
Update to FFmpeg 5.0.1
soerentsch May 23, 2022
a270dd1
Update to FFmpeg 5.0.1
soerentsch May 23, 2022
0cf31a3
Update to FFmpeg 5.0.1
soerentsch May 23, 2022
930e76a
Update alpine to 3.16
soerentsch Jun 1, 2022
470e054
added testing repo from alpine
soerentsch Jun 1, 2022
dcf5719
Update README.md
soerentsch Jun 1, 2022
8112174
Added ALPINE_VERSION variable
Jun 3, 2022
eecdf64
Update Jasper to 3.0.4
soerentsch Jun 7, 2022
a41c242
Update Jasper to 3.0.4
soerentsch Jun 7, 2022
e8e87ff
Cleanup Label
soerentsch Jun 8, 2022
0a4ef6b
Add Gitter badge
gitter-badger Jun 15, 2022
8e46f43
Merge pull request #1 from gitter-badger/gitter-badge
soerentsch Jun 15, 2022
237039f
Update README.md
soerentsch Jun 24, 2022
ac5a4dd
Update README.md
soerentsch Jun 24, 2022
94c9422
Update README.md
soerentsch Jun 24, 2022
b9eecc0
Added JRE_PACKAGE build-arg
soerentsch Jun 25, 2022
5a02297
Merge remote-tracking branch 'refs/remotes/origin/dockerhub' into doc…
soerentsch Jun 25, 2022
4206e22
Update README.md
soerentsch Jun 25, 2022
53907fa
Update README.md
soerentsch Jun 27, 2022
fe70508
Update README.md
Jun 27, 2022
53a6b7e
Update README.md
Jun 27, 2022
5659454
Update README.md
Jun 27, 2022
52eeca6
Update README.md
soerentsch Jun 28, 2022
84e41d7
cleanup alpine packages
soerentsch Jul 11, 2022
bf9a333
Added download script to update jars
soerentsch Jul 11, 2022
f52d35b
cleanup alpine packages
soerentsch Jul 11, 2022
d2bb9a5
cleanup ffmpeg config
soerentsch Jul 11, 2022
034e6b3
ffmpeg deps
soerentsch Jul 11, 2022
93d8937
ffmpeg config
soerentsch Jul 11, 2022
e0616f9
ffmpeg config
soerentsch Jul 11, 2022
bcbc0bc
Merge branch 'dockerhub' of https://github.com/soerentsch/docker-serv…
soerentsch Jul 11, 2022
fc17d83
added pom.xml from serviio.jar
soerentsch Jul 12, 2022
668a3d1
trimming pom.xml
soerentsch Jul 12, 2022
9309d29
Added optional FFmpeg build parameter
soerentsch Jul 14, 2022
7978060
maven script
soerentsch Jul 15, 2022
83e7be2
Merge branch 'dockerhub' of https://github.com/soerentsch/docker-serv…
soerentsch Jul 15, 2022
fd715c6
Disable the Healthcheck to To prevent continuous Disk Activity (#29)
soerentsch Jul 19, 2022
55adaa1
Update to Jasper 3.0.6
Jul 19, 2022
d4075a9
Update README.md
Jul 19, 2022
aaa7f73
Update alpine to 3.16.1
Jul 19, 2022
e58a3b7
Update README.md
Jul 19, 2022
2847646
Added more jar Versions
Jul 21, 2022
d7cbef2
Update FFmpeg to 5.1
soerentsch Jul 22, 2022
9739984
Merge branch 'dockerhub' of https://github.com/soerentsch/docker-serv…
soerentsch Jul 22, 2022
cb8a1b8
Update README.md
soerentsch Jul 22, 2022
52226ec
Update alpine to 3.16.2. Replaced librtmp by native FFmpeg routines. …
soerentsch Aug 16, 2022
fb3b7ef
cleanup unused code
soerentsch Aug 16, 2022
2613aed
cleanup dependencies
Aug 26, 2022
1ed64a3
Update README.md
soerentsch Sep 7, 2022
83d0cbc
Update README.md
soerentsch Sep 29, 2022
8cff39f
Update README.md
soerentsch Oct 23, 2022
74c3ba5
Update Serviio to 2.3
soerentsch Oct 23, 2022
78602a4
Update README.md
soerentsch Oct 27, 2022
a04908d
Added OpenContainers Annotations
soerentsch Nov 2, 2022
51ace31
Update alpine to 3.16.3
soerentsch Nov 16, 2022
2bac9a3
Update alpine to 3.17.0
soerentsch Nov 23, 2022
e1a326a
Added s390x support
soerentsch Dec 8, 2022
4152518
Update Jasper to 4.0.0.
soerentsch Jan 5, 2023
4e2ab31
Clean up repo
soerentsch Jan 12, 2023
ea69d0a
Update alpine to 3.17.1
soerentsch Jan 24, 2023
689f5f7
Update README.md
soerentsch Jan 24, 2023
15a92be
Update alpine to 3.17.2
soerentsch Feb 16, 2023
30ad85c
Update README.md
soerentsch Mar 6, 2023
aa261eb
Update alpine to 3.17.3
soerentsch Mar 31, 2023
4b4460d
Switch back from own build to Alpine package for Jasper
soerentsch May 4, 2023
0de8862
Update README.md
soerentsch May 9, 2023
f67a079
Update alpine to 3.18.0
soerentsch May 12, 2023
f33a5d2
Update alpine to 3.18.2
soerentsch Jul 7, 2023
e5fe205
Update alpine to 3.18.2
soerentsch Jul 7, 2023
506b5b9
Update alpine to 3.18.3
soerentsch Aug 11, 2023
f81c440
Update alpine to 3.18.3
soerentsch Aug 11, 2023
b84da62
Update alpine to 3.18.4
soerentsch Sep 29, 2023
94f2d55
Update FFmpeg to 6.0.1. Many minor alpine updates.
soerentsch Nov 27, 2023
ef65b8f
Update alpine to 3.18.5
soerentsch Dec 4, 2023
ec61dc5
v2.3-update16
soerentsch Jan 19, 2024
2b1ea74
v2.3-update17
soerentsch Jan 19, 2024
e449111
Update alpine to 3.19.1. Added ppc64le support.
soerentsch Feb 2, 2024
ba7d813
Update xz package (fixed CVE-2024-3094). Many minor alpine updates.
soerentsch Apr 2, 2024
dc9e108
Update alpine to 3.20.0
soerentsch Jun 11, 2024
dd7b415
Update Serviio to 2.4
soerentsch Jun 11, 2024
c096f98
Update alpine to 3.20.1
soerentsch Jul 9, 2024
b4a7619
Update alpine to 3.20.2
soerentsch Jul 31, 2024
5ce30be
Update alpine to 3.20.3
soerentsch Sep 9, 2024
5a6cecc
Many minor alpine updates
soerentsch Nov 8, 2024
aabf3a6
Update alpine to 3.21.0
soerentsch Dec 10, 2024
b3c22a0
Added new Heathcheck
soerentsch Dec 10, 2024
e6e8296
Added JAVA_OPTS environment variable. Added new Heathcheck.
soerentsch Dec 29, 2024
4513011
Merge branch 'dockerhub' of github.com:soerentsch/docker-serviio into…
soerentsch Dec 29, 2024
4ec3bbf
Fix Healthcheck
soerentsch Dec 29, 2024
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
5 changes: 0 additions & 5 deletions .github/FUNDING.yml

This file was deleted.

249 changes: 67 additions & 182 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,208 +1,93 @@
# Serviio docker
#
# Run with: docker run --rm --name serviio -d -p 23423:23423/tcp -p 23424:23424/tcp -p 8895:8895/tcp -p 1900:1900/udp -v /etc/localtime:/etc/localtime:ro riftbit/serviio
# Run with: docker run --rm --name serviio -d -p 23423:23423/tcp -p 23424:23424/tcp -p 8895:8895/tcp -p 1900:1900/udp -v /etc/localtime:/etc/localtime:ro soerentsch/serviio
ARG ALPINE_VERSION=3.21

FROM alpine:3.12

MAINTAINER "[riftbit] ErgoZ <ergozru@gmail.com>"
FROM alpine:${ALPINE_VERSION}

ARG BUILD_DATE
ARG VCS_REF
ARG VERSION=2.2
ARG BUILD_VCS_REF

LABEL org.label-schema.build-date=$BUILD_DATE \
org.label-schema.name="DLNA Serviio Container" \
ARG SERVIIO_VERSION=2.4
ARG JRE_PACKAGE=openjdk8-jre

LABEL \
org.label-schema.build-date="${BUILD_DATE}" \
org.label-schema.description="DLNA Serviio Container" \
org.label-schema.url="https://riftbit.com/" \
org.label-schema.vcs-ref=$VCS_REF \
org.label-schema.vcs-url="https://hub.docker.com/r/riftbit/serviio/" \
org.label-schema.vendor="[riftbit] ErgoZ <ergozru@gmail.com>" \
org.label-schema.version=$VERSION \
org.label-schema.name="DLNA Serviio Container" \
org.label-schema.schema-version="1.0" \
maintainer="[riftbit] ErgoZ <ergozru@gmail.com>"
org.label-schema.url="https://hub.docker.com/r/soerentsch/serviio/" \
org.label-schema.vcs-ref="${BUILD_VCS_REF}" \
org.label-schema.vcs-url="https://github.dev/soerentsch/docker-serviio/" \
org.label-schema.vendor="[soerentsch] Soeren <soerentsch@gmail.com>" \
org.label-schema.version="${SERVIIO_VERSION}" \
maintainer="[soerentsch] Soeren <soerentsch@gmail.com>"

ARG FFMPEG_VERSION=4.3.2
ARG JASPER_VERSION=2.0.14
LABEL \
org.opencontainers.image.created="${BUILD_DATE}" \
org.opencontainers.image.description="DLNA Serviio Container" \
org.opencontainers.image.title="DLNA Serviio Container" \
org.opencontainers.image.url="https://hub.docker.com/r/soerentsch/serviio/" \
org.opencontainers.image.revision="${BUILD_VCS_REF}" \
org.opencontainers.image.source="https://github.dev/soerentsch/docker-serviio/" \
org.opencontainers.image.vendor="[soerentsch] Soeren <soerentsch@gmail.com>" \
org.opencontainers.image.version="${SERVIIO_VERSION}" \
org.opencontainers.image.authors="[soerentsch] Soeren <soerentsch@gmail.com>"

ENV JAVA_HOME="/usr"

# echo "http://dl-cdn.alpinelinux.org/alpine/edge/community" >> /etc/apk/repositories; \
# echo "http://dl-cdn.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories; \
# echo "http://dl-cdn.alpinelinux.org/alpine/edge/main" >> /etc/apk/repositories; \
ENV JAVA_OPTS="-XX:+UsePerfData"

# Prepare APK CDNs
RUN echo "http://dl-cdn.alpinelinux.org/alpine/v3.11/community" >> /etc/apk/repositories && \
echo "http://dl-cdn.alpinelinux.org/alpine/v3.10/main" >> /etc/apk/repositories && \
echo "http://dl-cdn.alpinelinux.org/alpine/v3.10/community" >> /etc/apk/repositories && \
echo "http://dl-cdn.alpinelinux.org/alpine/edge/community" >> /etc/apk/repositories && \
apk update && apk upgrade && \
apk add --no-cache --update \
alsa-lib \
bzip2 \
expat \
fdk-aac \
lame \
libbz2 \
libdrm \
libffi \
libjpeg-turbo \
libtheora \
libogg \
libpciaccess \
librtmp \
libstdc++ \
libtasn1 \
libva \
libvorbis \
libvpx \
mesa-gl \
mesa-glapi \
musl \
opus \
openjdk8-jre \
openssl \
p11-kit \
sdl \
x264-libs \
x264 \
x265 \
libass-dev \
gnutls-dev \
libwebp-dev \
lame-dev \
v4l-utils-libs \
xvidcore && \
apk add --no-cache --update --virtual=.build-dependencies \
alsa-lib-dev \
bzip2-dev \
coreutils \
curl \
fdk-aac-dev \
freetype-dev \
g++ \
gcc \
git \
imlib2-dev \
lcms2-dev \
libgcc \
libjpeg-turbo-dev \
libtheora-dev \
libogg-dev \
libva-dev \
libvorbis-dev \
libvpx-dev \
libx11 \
libxau \
libxcb \
libxcb-dev \
libxdamage \
libxdmcp \
libxext \
libxfixes \
libxfixes-dev \
libxshmfence \
libxxf86vm \
make \
cmake \
musl-dev \
nasm \
nettle \
opus-dev \
openssl-dev \
pkgconf \
pkgconf-dev \
rtmpdump-dev \
sdl-dev \
tar \
ttf-dejavu \
v4l-utils-dev \
x264-dev \
x265-dev \
xvidcore-dev \
yasm-dev \
zlib-dev && \
DIR=$(mktemp -d) && cd ${DIR} && \
curl -s http://ffmpeg.org/releases/ffmpeg-${FFMPEG_VERSION}.tar.gz | tar zxf - -C . && \
cd ffmpeg-${FFMPEG_VERSION} && \
./configure \
--disable-doc \
--disable-debug \
--disable-shared \
--enable-avfilter \
--enable-avresample \
--enable-gnutls \
--enable-gpl \
--enable-libass \
--enable-libfdk-aac \
--enable-libfreetype \
--enable-libmp3lame \
--enable-libopus \
--enable-librtmp \
--enable-libtheora \
--enable-libv4l2 \
--enable-libvorbis \
--enable-libvpx \
--enable-libwebp \
--enable-libx264 \
--enable-libx265 \
--enable-libxcb \
--enable-libxvid \
--enable-nonfree \
--enable-pic \
--enable-pthreads \
--enable-postproc \
--enable-static \
--enable-small \
--enable-version3 \
--enable-vaapi \
--extra-libs="-lpthread -lm" \
--prefix=/usr && \
make -j4 && \
make install && \
gcc -o tools/qt-faststart $CFLAGS tools/qt-faststart.c && \
install -D -m755 tools/qt-faststart /usr/bin/qt-faststart && \
make distclean && \
cd ${DIR} && \
curl -sfL https://www.ece.uvic.ca/~frodo/jasper/software/jasper-${JASPER_VERSION}.tar.gz | tar xz && \
cd jasper-${JASPER_VERSION} && \
mkdir ./obj && \
cd ./obj && \
cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_LIBDIR=/usr/lib && \
make && \
make install && \
cd ${DIR} && \
wget https://raw.githubusercontent.com/riftbit/dcraw/master/dcraw.c && \
gcc -o dcraw -O4 dcraw.c -lm -ljasper -ljpeg -llcms2 && \
cp dcraw /usr/bin/dcraw && \
chmod +x /usr/bin/dcraw && \
cd ${DIR} && \
curl -s http://download.serviio.org/releases/serviio-${VERSION}-linux.tar.gz | tar zxvf - -C . && \
mkdir -p /opt/serviio && \
mkdir -p /media/serviio && \
mv ./serviio-${VERSION}/* /opt/serviio && \
chmod +x /opt/serviio/bin/serviio.sh && \
mkdir -p /opt/serviio/log && \
touch /opt/serviio/log/serviio.log && \
rm -rf ${DIR} && \
apk del --purge .build-dependencies && \
rm -rf /var/cache/apk/*

RUN set -ex \
&& echo "https://dl-cdn.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories \
&& echo "https://dl-cdn.alpinelinux.org/alpine/edge/community" >> /etc/apk/repositories \
&& echo "https://dl-cdn.alpinelinux.org/alpine/edge/main" >> /etc/apk/repositories \
&& apk update && apk upgrade \
&& apk add --no-cache --update \
ffmpeg \
jasper \
${JRE_PACKAGE} \
&& apk add --no-cache --update --virtual=.build-dependencies \
g++ \
jasper-dev \
lcms2-dev \
### Create WORKDIR and get all ingredients
&& DIR=$(mktemp -d) && cd ${DIR} \
&& wget https://raw.githubusercontent.com/soerentsch/dcraw/master/dcraw.c \
&& wget https://download.serviio.org/releases/serviio-${SERVIIO_VERSION}-linux.tar.gz && tar xvf serviio-${SERVIIO_VERSION}-linux.tar.gz \
### Build dcraw
&& cd ${DIR} \
&& gcc -o dcraw -O4 dcraw.c -lm -ljasper -ljpeg -llcms2 \
&& cp dcraw /usr/bin/dcraw \
&& chmod +x /usr/bin/dcraw \
### Install Serviio
&& cd ${DIR} \
&& mkdir -p /opt/serviio \
&& mkdir -p /media/serviio \
&& mv ./serviio-${SERVIIO_VERSION}/* /opt/serviio \
&& chmod +x /opt/serviio/bin/serviio.sh \
&& mkdir -p /opt/serviio/log \
&& touch /opt/serviio/log/serviio.log \
### Cleanup
&& rm -rf ${DIR} \
&& apk del --purge .build-dependencies \
&& rm -rf /var/cache/apk/*

VOLUME ["/opt/serviio/config", "/opt/serviio/library", "/opt/serviio/log", "/opt/serviio/plugins", "/media/serviio"]

# VOLUME ["/opt/serviio/config", "/opt/serviio/library", "/opt/serviio/log", "/opt/serviio/plugins", "/media/serviio"]

# DLNA
EXPOSE 1900/udp
# Serviio Content Delivery
EXPOSE 8895/tcp
# HTTP/1.1 /console /rest
EXPOSE 23423/tcp
# HTTPS/1.1 /console /rest
EXPOSE 23523/tcp
# HTTP/1.1 /cds /mediabrowser
EXPOSE 23424/tcp
# HTTPS/1.1 /console /rest
EXPOSE 23523/tcp
# HTTPS/1.1 /cds /mediabrowser
EXPOSE 23524/tcp

HEALTHCHECK --start-period=5m CMD wget --quiet --tries=1 -O /dev/null --server-response --timeout=5 http://127.0.0.1:23423/console/ || exit 1
HEALTHCHECK --start-period=5m CMD wget --quiet --tries=1 -O /dev/null --server-response --timeout=5 http://127.0.0.1:23423/rest/ping || exit 1

#-Dserviio.defaultTranscodeFolder=/opt/serviio/transcode
CMD tail -f /opt/serviio/log/serviio.log & /opt/serviio/bin/serviio.sh
98 changes: 0 additions & 98 deletions Dockerfile.debian

This file was deleted.

Loading