Skip to content

Rebase to Alpine 3.24 and ffmpeg7 + use packaged argtable2 #279

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.

Sign up for GitHub

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

Open
conman124 wants to merge 1 commit into
base: master
Choose a base branch
from
+30 −3,380
Open

Rebase to Alpine 3.24 and ffmpeg7 + use packaged argtable2 #279

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
54 changes: 15 additions & 39 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,30 +5,27 @@
FROM ghcr.io/linuxserver/picons-builder as piconsstage


FROM ghcr.io/linuxserver/baseimage-alpine:3.20 as buildstage
FROM ghcr.io/linuxserver/baseimage-alpine:3.24 as buildstage
############## build stage ##############

# package versions
ARG ARGTABLE_VER="2.13"

# environment settings
ARG TZ="Etc/UTC"
ARG TVHEADEND_COMMIT
ENV HOME="/config"

# copy patches and picons
COPY patches/ /tmp/patches/
# copy picons
COPY --from=piconsstage /picons.tar.bz2 /picons.tar.bz2

RUN \
echo "**** install build packages ****" && \
apk add --no-cache \
argtable2-dev \
autoconf \
automake \
bsd-compat-headers \
build-base \
cmake \
ffmpeg4-dev \
ffmpeg7-dev \
file \
findutils \
gettext-dev \
Expand Down Expand Up @@ -109,27 +106,6 @@ RUN \
make -j 2 && \
make DESTDIR=/tmp/tvheadend-build install

RUN \
echo "**** compile argtable2 ****" && \
ARGTABLE_VER1="${ARGTABLE_VER//./-}" && \
mkdir -p \
/tmp/argtable && \
curl -s -o \
/tmp/argtable-src.tar.gz -L \
"https://sourceforge.net/projects/argtable/files/argtable/argtable-${ARGTABLE_VER}/argtable${ARGTABLE_VER1}.tar.gz" && \
tar xf \
/tmp/argtable-src.tar.gz -C \
/tmp/argtable --strip-components=1 && \
cp /tmp/patches/config.* /tmp/argtable && \
cd /tmp/argtable && \
./configure \
--prefix=/usr && \
make -j 2 && \
make check && \
make DESTDIR=/tmp/argtable-build install && \
echo "**** copy to /usr for comskip dependency ****" && \
cp -pr /tmp/argtable-build/usr/* /usr/

RUN \
echo "***** compile comskip ****" && \
git clone https://github.com/erikkaashoek/Comskip /tmp/comskip && \
Expand All @@ -149,7 +125,7 @@ RUN \
/picons

############## runtime stage ##############
FROM ghcr.io/linuxserver/baseimage-alpine:3.20
FROM ghcr.io/linuxserver/baseimage-alpine:3.24

# set version label
ARG BUILD_DATE
Expand All @@ -163,16 +139,17 @@ ENV HOME="/config"
RUN \
echo "**** install runtime packages ****" && \
apk add --no-cache \
argtable2 \
bsd-compat-headers \
ffmpeg \
ffmpeg4-libavcodec \
ffmpeg4-libavdevice \
ffmpeg4-libavfilter \
ffmpeg4-libavformat \
ffmpeg4-libavutil \
ffmpeg4-libpostproc \
ffmpeg4-libswresample \
ffmpeg4-libswscale \
ffmpeg7 \
ffmpeg7-libavcodec \
ffmpeg7-libavdevice \
ffmpeg7-libavfilter \
ffmpeg7-libavformat \
ffmpeg7-libavutil \
ffmpeg7-libpostproc \
ffmpeg7-libswresample \
ffmpeg7-libswscale \
gnu-libiconv \
libdvbcsa \
libhdhomerun-libs \
Expand Down Expand Up @@ -200,7 +177,6 @@ RUN \
printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version

# copy local files and buildstage artifacts
COPY --from=buildstage /tmp/argtable-build/usr/ /usr/
COPY --from=buildstage /tmp/comskip-build/usr/ /usr/
COPY --from=buildstage /tmp/tvheadend-build/usr/ /usr/
COPY --from=buildstage /picons /picons
Expand Down
54 changes: 15 additions & 39 deletions Dockerfile.aarch64
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,30 +5,27 @@
FROM ghcr.io/linuxserver/picons-builder as piconsstage


FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.20 as buildstage
FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.24 as buildstage
############## build stage ##############

# package versions
ARG ARGTABLE_VER="2.13"

# environment settings
ARG TZ="Etc/UTC"
ARG TVHEADEND_COMMIT
ENV HOME="/config"

# copy patches and picons
COPY patches/ /tmp/patches/
# copy picons
COPY --from=piconsstage /picons.tar.bz2 /picons.tar.bz2

RUN \
echo "**** install build packages ****" && \
apk add --no-cache \
argtable2-dev \
autoconf \
automake \
bsd-compat-headers \
build-base \
cmake \
ffmpeg4-dev \
ffmpeg7-dev \
file \
findutils \
gettext-dev \
Expand Down Expand Up @@ -109,27 +106,6 @@ RUN \
make -j 2 && \
make DESTDIR=/tmp/tvheadend-build install

RUN \
echo "**** compile argtable2 ****" && \
ARGTABLE_VER1="${ARGTABLE_VER//./-}" && \
mkdir -p \
/tmp/argtable && \
curl -s -o \
/tmp/argtable-src.tar.gz -L \
"https://sourceforge.net/projects/argtable/files/argtable/argtable-${ARGTABLE_VER}/argtable${ARGTABLE_VER1}.tar.gz" && \
tar xf \
/tmp/argtable-src.tar.gz -C \
/tmp/argtable --strip-components=1 && \
cp /tmp/patches/config.* /tmp/argtable && \
cd /tmp/argtable && \
./configure \
--prefix=/usr && \
make -j 2 && \
make check && \
make DESTDIR=/tmp/argtable-build install && \
echo "**** copy to /usr for comskip dependency ****" && \
cp -pr /tmp/argtable-build/usr/* /usr/

RUN \
echo "***** compile comskip ****" && \
git clone https://github.com/erikkaashoek/Comskip /tmp/comskip && \
Expand All @@ -150,7 +126,7 @@ RUN \


############## runtime stage ##############
FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.20
FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.24

# set version label
ARG BUILD_DATE
Expand All @@ -164,16 +140,17 @@ ENV HOME="/config"
RUN \
echo "**** install runtime packages ****" && \
apk add --no-cache \
argtable2 \
bsd-compat-headers \
ffmpeg \
ffmpeg4-libavcodec \
ffmpeg4-libavdevice \
ffmpeg4-libavfilter \
ffmpeg4-libavformat \
ffmpeg4-libavutil \
ffmpeg4-libpostproc \
ffmpeg4-libswresample \
ffmpeg4-libswscale \
ffmpeg7 \
ffmpeg7-libavcodec \
ffmpeg7-libavdevice \
ffmpeg7-libavfilter \
ffmpeg7-libavformat \
ffmpeg7-libavutil \
ffmpeg7-libpostproc \
ffmpeg7-libswresample \
ffmpeg7-libswscale \
gnu-libiconv \
libdvbcsa \
libhdhomerun-libs \
Expand All @@ -199,7 +176,6 @@ RUN \
printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version

# copy local files and buildstage artifacts
COPY --from=buildstage /tmp/argtable-build/usr/ /usr/
COPY --from=buildstage /tmp/comskip-build/usr/ /usr/
COPY --from=buildstage /tmp/tvheadend-build/usr/ /usr/
COPY --from=buildstage /picons /picons
Expand Down
Loading