diff --git a/Dockerfile b/Dockerfile index ccedc06..4b91dc2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,7 +5,7 @@ FROM ghcr.io/linuxserver/picons-builder as piconsstage -FROM ghcr.io/linuxserver/baseimage-alpine:3.17 as buildstage +FROM ghcr.io/linuxserver/baseimage-alpine:3.18 as buildstage ############## build stage ############## # package versions @@ -117,7 +117,7 @@ RUN \ RUN \ echo "**** install perl modules for xmltv ****" && \ curl -s -L https://cpanmin.us | perl - App::cpanminus && \ - cpanm --installdeps /tmp/patches + cpanm --no-interactive --installdeps /tmp/patches RUN \ echo "**** compile XMLTV ****" && \ @@ -225,7 +225,7 @@ RUN \ /picons ############## runtime stage ############## -FROM ghcr.io/linuxserver/baseimage-alpine:3.17 +FROM ghcr.io/linuxserver/baseimage-alpine:3.18 # set version label ARG BUILD_DATE @@ -241,7 +241,14 @@ RUN \ apk add --no-cache \ bsd-compat-headers \ ffmpeg \ - ffmpeg4-libs \ + ffmpeg4-libavcodec \ + ffmpeg4-libavdevice \ + ffmpeg4-libavfilter \ + ffmpeg4-libavformat \ + ffmpeg4-libavutil \ + ffmpeg4-libpostproc \ + ffmpeg4-libswresample \ + ffmpeg4-libswscale \ gnu-libiconv \ libdvbcsa \ libhdhomerun-libs \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 26f83b8..3481301 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -5,7 +5,7 @@ FROM ghcr.io/linuxserver/picons-builder as piconsstage -FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.17 as buildstage +FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.18 as buildstage ############## build stage ############## # package versions @@ -117,7 +117,7 @@ RUN \ RUN \ echo "**** install perl modules for xmltv ****" && \ curl -s -L https://cpanmin.us | perl - App::cpanminus && \ - cpanm --installdeps /tmp/patches + cpanm --no-interactive --installdeps /tmp/patches RUN \ echo "**** compile XMLTV ****" && \ @@ -226,7 +226,7 @@ RUN \ ############## runtime stage ############## -FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.17 +FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.18 # set version label ARG BUILD_DATE @@ -242,7 +242,14 @@ RUN \ apk add --no-cache \ bsd-compat-headers \ ffmpeg \ - ffmpeg4-libs \ + ffmpeg4-libavcodec \ + ffmpeg4-libavdevice \ + ffmpeg4-libavfilter \ + ffmpeg4-libavformat \ + ffmpeg4-libavutil \ + ffmpeg4-libpostproc \ + ffmpeg4-libswresample \ + ffmpeg4-libswscale \ gnu-libiconv \ libdvbcsa \ libhdhomerun-libs \ diff --git a/README.md b/README.md index 22a2ed8..f1bcec7 100644 --- a/README.md +++ b/README.md @@ -301,6 +301,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **18.05.23:** - Rebase to Alpine 3.18. * **17.03.23:** - Extract picons during build instead of init. * **23.02.23:** - Rebase to Alpine 3.17, migrate to s6v3, drop armhf support. * **31.08.22:** - Update sample env vars and how RUN_OPTS are handled. diff --git a/readme-vars.yml b/readme-vars.yml index 708923f..8ff43c8 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -123,6 +123,7 @@ app_setup_block: | # changelog changelogs: + - { date: "18.05.23:", desc: "Rebase to Alpine 3.18." } - { date: "17.03.23:", desc: "Extract picons during build instead of init." } - { date: "23.02.23:", desc: "Rebase to Alpine 3.17, migrate to s6v3, drop armhf support." } - { date: "31.08.22:", desc: "Update sample env vars and how RUN_OPTS are handled." }