Bot Updating Package Versions

Merge pull request #203 from linuxserver/picons
switch to new picons builder
2022-08-20 11:43:19 -05:00 · 2022-08-20 12:20:56 -04:00 · 2022-08-20 11:17:28 -04:00 · 2022-08-19 16:05:19 -04:00
7 changed files with 26 additions and 20 deletions
--- a/13
+++ b/13
@@ -218,6 +218,11 @@ RUN \
 make -j 2 && \
 make DESTDIR=/tmp/comskip-build install

+############## picons stage ##############
+# built by https://github.com/linuxserver/picons-builder
+FROM ghcr.io/linuxserver/picons-builder as piconsstage
+
+
 ############## runtime stage ##############
 FROM ghcr.io/linuxserver/baseimage-alpine:3.15

@@ -315,12 +320,7 @@ RUN \
 	wget \
 	x264 \
 	x265 \
-	zlib && \
- echo "**** Add Picons ****" && \
- mkdir -p /picons && \
- curl -s -o \
-        /picons.tar.bz2 -L \
-        https://lsio-ci.ams3.digitaloceanspaces.com/picons/picons.tar.bz2
+	zlib

 # copy local files and buildstage artifacts
 COPY --from=buildstage /tmp/argtable-build/usr/ /usr/
@@ -329,6 +329,7 @@ COPY --from=buildstage /tmp/tvheadend-build/usr/ /usr/
 COPY --from=buildstage /tmp/xmltv-build/usr/ /usr/
 COPY --from=buildstage /usr/local/share/man/ /usr/local/share/man/
 COPY --from=buildstage /usr/local/share/perl5/ /usr/local/share/perl5/
+COPY --from=piconsstage /picons.tar.bz2 /picons.tar.bz2
 COPY root/ /

 # ports and volumes
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -216,6 +216,11 @@ RUN \
 make -j 2 && \
 make DESTDIR=/tmp/comskip-build install

+############## picons stage ##############
+# built by https://github.com/linuxserver/picons-builder
+FROM ghcr.io/linuxserver/picons-builder as piconsstage
+
+
 ############## runtime stage ##############
 FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.15

@@ -309,12 +314,7 @@ RUN \
 	wget \
 	x264 \
 	x265 \
-	zlib && \
- echo "**** Add Picons ****" && \
- mkdir -p /picons && \
- curl -o \
-        /picons.tar.bz2 -L \
-        https://lsio-ci.ams3.digitaloceanspaces.com/picons/picons.tar.bz2
+	zlib

 # copy local files and buildstage artifacts
 COPY --from=buildstage /tmp/argtable-build/usr/ /usr/
@@ -323,6 +323,7 @@ COPY --from=buildstage /tmp/tvheadend-build/usr/ /usr/
 COPY --from=buildstage /tmp/xmltv-build/usr/ /usr/
 COPY --from=buildstage /usr/local/share/man/ /usr/local/share/man/
 COPY --from=buildstage /usr/local/share/perl5/ /usr/local/share/perl5/
+COPY --from=piconsstage /picons.tar.bz2 /picons.tar.bz2
 COPY root/ /

 # ports and volumes
--- a/Dockerfile.armhf
+++ b/Dockerfile.armhf
@@ -217,6 +217,11 @@ RUN \
 make -j 2 && \
 make DESTDIR=/tmp/comskip-build install

+############## picons stage ##############
+# built by https://github.com/linuxserver/picons-builder
+FROM ghcr.io/linuxserver/picons-builder as piconsstage
+
+
 ############## runtime stage ##############
 FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.15

@@ -310,12 +315,7 @@ RUN \
 	wget \
 	x264 \
 	x265 \
-	zlib && \
- echo "**** Add Picons ****" && \
- mkdir -p /picons && \
- curl -o \
-        /picons.tar.bz2 -L \
-        https://lsio-ci.ams3.digitaloceanspaces.com/picons/picons.tar.bz2
+	zlib

 # copy local files and buildstage artifacts
 COPY --from=buildstage /tmp/argtable-build/usr/ /usr/
@@ -324,6 +324,7 @@ COPY --from=buildstage /tmp/tvheadend-build/usr/ /usr/
 COPY --from=buildstage /tmp/xmltv-build/usr/ /usr/
 COPY --from=buildstage /usr/local/share/man/ /usr/local/share/man/
 COPY --from=buildstage /usr/local/share/perl5/ /usr/local/share/perl5/
+COPY --from=piconsstage /picons.tar.bz2 /picons.tar.bz2
 COPY root/ /

 # ports and volumes
--- a/README.md
+++ b/README.md
@@ -309,6 +309,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64

 ## Versions

+* **19.08.22:** - Switch to new picons builder.
 * **16.04.22:** - Added URL XMLTV grabber.
 * **05.01.22:** - Rebase to Alpine 3.15. Disable execinfo to fix builds. Update xmltv.
 * **11.05.21:** - Added Intel iHD driver support.
--- a/package_versions.txt
+++ b/package_versions.txt
@@ -81,7 +81,7 @@ libxcb-1.14-r2
 libxdmcp-1.1.3-r0
 libxext-1.3.4-r0
 libxfixes-6.0.0-r0
-libxml2-2.9.14-r0
+libxml2-2.9.14-r1
 libxshmfence-1.3-r1
 libxslt-1.1.35-r0
 linux-headers-5.10.41-r0
@@ -257,5 +257,5 @@ x265-libs-3.5-r0
 xvidcore-1.3.7-r1
 xz-5.2.5-r1
 xz-libs-5.2.5-r1
-zlib-1.2.12-r2
+zlib-1.2.12-r3
 zstd-libs-1.5.0-r0
--- a/readme-vars.yml
+++ b/readme-vars.yml
@@ -124,6 +124,7 @@ app_setup_block: |

 # changelog
 changelogs:
+  - { date: "19.08.22:", desc: "Switch to new picons builder." }
  - { date: "16.04.22:", desc: "Added URL XMLTV grabber." }
  - { date: "05.01.22:", desc: "Rebase to Alpine 3.15. Disable execinfo to fix builds. Update xmltv." }
  - { date: "11.05.21:", desc: "Added Intel iHD driver support." }
--- a/root/etc/cont-init.d/30-config
+++ b/root/etc/cont-init.d/30-config
@@ -14,6 +14,7 @@ mkdir -p \

 # extract picons on first run
 [[ -f /picons.tar.bz2 ]] && \
+        mkdir -p /picons
 	tar xf \
 		/picons.tar.bz2 -C \
 		/picons &&
Author	SHA1	Message	Date
LinuxServer-CI	69dc360432	Bot Updating Package Versions	2022-08-20 11:43:19 -05:00
aptalca	a9b8cf69af	Merge pull request #203 from linuxserver/picons switch to new picons builder	2022-08-20 12:20:56 -04:00
aptalca	1328a5f23c	create picons folder	2022-08-20 11:17:28 -04:00
aptalca	609d004130	switch to new picons builder	2022-08-19 16:05:19 -04:00