Merge pull request #90 from linuxserver/package_info

Move to /app
2020-04-05 01:35:26 -05:00 · 2020-04-03 22:27:56 -05:00 · 2020-03-31 08:26:14 +00:00 · 2020-03-28 17:04:39 -04:00 · 2020-03-28 13:46:27 -07:00 · 2020-03-24 05:33:20 -04:00
7 changed files with 173 additions and 155 deletions
@@ -1,4 +1,4 @@
-FROM lsiobase/ubuntu:bionic
+FROM lsiobase/ubuntu:focal

 # set version label
 ARG BUILD_DATE
@@ -14,15 +14,14 @@ ENV XDG_CONFIG_HOME="/config/xdg"

 RUN \
 echo "**** install packages ****" && \
- sed -i 's/bionic/eoan/g' /etc/apt/sources.list && \
 apt-get update && \
 apt-get install --no-install-recommends -y \
 	jq \
-	libicu63 \
+	libicu66 \
 	libmediainfo0v5 \
 	sqlite3 && \
 echo "**** install radarr ****" && \
- mkdir -p /opt/radarr && \
+ mkdir -p /app/radarr/bin && \
 if [ -z ${RADARR_RELEASE+x} ]; then \
 	RADARR_RELEASE=$(curl -sL "https://radarr.lidarr.audio/v1/update/${RADARR_BRANCH}/changes?os=linux" \
 	| jq -r '.[0].version'); \
@@ -32,10 +31,11 @@ RUN \
 	"https://radarr.lidarr.audio/v1/update/${RADARR_BRANCH}/updatefile?version=${RADARR_RELEASE}&os=linux&runtime=netcore&arch=x64" && \
 tar ixzf \
 /tmp/radarr.tar.gz -C \
-	/opt/radarr --strip-components=1 && \
+	/app/radarr/bin --strip-components=1 && \
+ echo "UpdateMethod=docker\nBranch=${RADARR_BRANCH}\nPackageVersion=${VERSION}\nPackageAuthor=linuxserver.io" > /app/radarr/package_info && \
 echo "**** cleanup ****" && \
 rm -rf \
-	/opt/radarr/Radarr.Update \
+	/app/radarr/bin/Radarr.Update \
 	/tmp/* \
 	/var/lib/apt/lists/* \
 	/var/tmp/*
@@ -1,4 +1,4 @@
-FROM lsiobase/ubuntu:arm64v8-bionic
+FROM lsiobase/ubuntu:arm64v8-focal

 # set version label
 ARG BUILD_DATE
@@ -14,15 +14,14 @@ ENV XDG_CONFIG_HOME="/config/xdg"

 RUN \
 echo "**** install packages ****" && \
- sed -i 's/bionic/eoan/g' /etc/apt/sources.list && \
 apt-get update && \
 apt-get install --no-install-recommends -y \
 	jq \
-	libicu63 \
+	libicu66 \
 	libmediainfo0v5 \
 	sqlite3 && \
 echo "**** install radarr ****" && \
- mkdir -p /opt/radarr && \
+ mkdir -p /app/radarr/bin && \
 if [ -z ${RADARR_RELEASE+x} ]; then \
 	RADARR_RELEASE=$(curl -sL "https://radarr.lidarr.audio/v1/update/${RADARR_BRANCH}/changes?os=linux" \
 	| jq -r '.[0].version'); \
@@ -32,10 +31,11 @@ RUN \
 	"https://radarr.lidarr.audio/v1/update/${RADARR_BRANCH}/updatefile?version=${RADARR_RELEASE}&os=linux&runtime=netcore&arch=arm64" && \
 tar ixzf \
 /tmp/radarr.tar.gz -C \
-	/opt/radarr --strip-components=1 && \
+	/app/radarr/bin --strip-components=1 && \
+ echo "UpdateMethod=docker\nBranch=${RADARR_BRANCH}\nPackageVersion=${VERSION}\nPackageAuthor=linuxserver.io" > /app/radarr/package_info && \
 echo "**** cleanup ****" && \
 rm -rf \
-	/opt/radarr/Radarr.Update \
+	/app/radarr/bin/Radarr.Update \
 	/tmp/* \
 	/var/lib/apt/lists/* \
 	/var/tmp/*
@@ -1,4 +1,4 @@
-FROM lsiobase/ubuntu:arm32v7-bionic
+FROM lsiobase/ubuntu:arm32v7-focal

 # set version label
 ARG BUILD_DATE
@@ -14,15 +14,14 @@ ENV XDG_CONFIG_HOME="/config/xdg"

 RUN \
 echo "**** install packages ****" && \
- sed -i 's/bionic/eoan/g' /etc/apt/sources.list && \
 apt-get update && \
 apt-get install --no-install-recommends -y \
 	jq \
-	libicu63 \
+	libicu66 \
 	libmediainfo0v5 \
 	sqlite3 && \
 echo "**** install radarr ****" && \
- mkdir -p /opt/radarr && \
+ mkdir -p /app/radarr/bin && \
 if [ -z ${RADARR_RELEASE+x} ]; then \
 	RADARR_RELEASE=$(curl -sL "https://radarr.lidarr.audio/v1/update/${RADARR_BRANCH}/changes?os=linux" \
 	| jq -r '.[0].version'); \
@@ -32,10 +31,11 @@ RUN \
 	"https://radarr.lidarr.audio/v1/update/${RADARR_BRANCH}/updatefile?version=${RADARR_RELEASE}&os=linux&runtime=netcore&arch=arm" && \
 tar ixzf \
 /tmp/radarr.tar.gz -C \
-	/opt/radarr --strip-components=1 && \
+	/app/radarr/bin --strip-components=1 && \
 echo "**** cleanup ****" && \
+ echo "UpdateMethod=docker\nBranch=${RADARR_BRANCH}\nPackageVersion=${VERSION}\nPackageAuthor=linuxserver.io" > /app/radarr/package_info && \
 rm -rf \
-	/opt/radarr/Radarr.Update \
+	/app/radarr/bin/Radarr.Update \
 	/tmp/* \
 	/var/lib/apt/lists/* \
 	/var/tmp/*
@@ -223,6 +223,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64

 ## Versions

+* **02.20.20:** - Rebase Preview to Focal.
 * **01.06.20:** - Use Eoan packages for preview branch.
 * **10.15.19:** - Use Netcore builds for preview branch.
 * **08.09.19:** - Pull artifacts from new upstream Azure build env.
@@ -1,137 +1,154 @@
-adduser3.116ubuntu1
-apt1.6.12
-apt-utils1.6.12
-base-files10.1ubuntu2.7
-base-passwd3.5.44
-bash4.4.18-2ubuntu1.2
-bsdutils1:2.31.1-0.4ubuntu3.4
-bzip21.0.6-8.1ubuntu0.2
-ca-certificates20180409
-coreutils8.28-1ubuntu1
-curl7.58.0-2ubuntu3.8
-dash0.5.8-2.10
-debconf1.5.66ubuntu1
-debianutils4.8.4
-diffutils1:3.6-1
-dpkg1.19.0.5ubuntu2.3
-e2fsprogs1.44.1-1ubuntu1.2
-fdisk2.31.1-0.4ubuntu3.4
-findutils4.6.0+git+20170828-2
-gcc-8-base8.3.0-6ubuntu1~18.04.1
-gpgv2.2.4-1ubuntu1.2
-grep3.1-2build1
-gzip1.6-5ubuntu1
-hostname3.20
-init-system-helpers1.51
-jq1.5+dfsg-2build1
-krb5-locales1.16-2ubuntu0.1
-libacl12.2.52-3build1
-libapt-inst2.01.6.12
-libapt-pkg5.01.6.12
-libasn1-8-heimdal7.5.0+dfsg-1
-libattr11:2.4.47-2build1
-libaudit11:2.8.2-1ubuntu1
-libaudit-common1:2.8.2-1ubuntu1
-libblkid12.31.1-0.4ubuntu3.4
-libbz2-1.01.0.6-8.1ubuntu0.2
-libc62.30-0ubuntu2
-libcap-ng00.7.7-3.1
-libc-bin2.30-0ubuntu2
-libcom-err21.44.1-1ubuntu1.2
-libcurl3-gnutls7.65.3-1ubuntu3
-libcurl47.58.0-2ubuntu3.8
-libdb5.35.3.28-13.1ubuntu1.1
-libdebconfclient00.213ubuntu1
-libext2fs21.44.1-1ubuntu1.2
-libfdisk12.31.1-0.4ubuntu3.4
-libffi63.2.1-8
-libgcc11:8.3.0-6ubuntu1~18.04.1
-libgcrypt201.8.1-4ubuntu1.2
-libgmp102:6.1.2+dfsg-2
-libgnutls303.6.9-5ubuntu1
-libgpg-error01.27-6
-libgssapi3-heimdal7.5.0+dfsg-1
-libgssapi-krb5-21.17-6
-libhcrypto4-heimdal7.5.0+dfsg-1
-libheimbase1-heimdal7.5.0+dfsg-1
-libheimntlm0-heimdal7.5.0+dfsg-1
-libhogweed43.4.1-1
-libhx509-5-heimdal7.5.0+dfsg-1
-libicu6363.2-2
-libidn2-02.0.4-1.1ubuntu0.2
-libjq11.5+dfsg-2build1
-libk5crypto31.16-2ubuntu0.1
-libkeyutils11.5.9-9.2ubuntu2
-libkrb5-26-heimdal7.5.0+dfsg-1
-libkrb5-31.17-6
-libkrb5support01.17-6
-libldap-2.4-22.4.45+dfsg-1ubuntu1.4
-libldap-common2.4.45+dfsg-1ubuntu1.4
-liblz4-10.0~r131-2ubuntu3
-liblzma55.2.2-1.3
-libmediainfo0v518.12-2
+adduser3.118ubuntu1
+apt1.9.10
+apt-utils1.9.10
+base-files11ubuntu2
+base-passwd3.5.47
+bash5.0-5ubuntu1
+bsdutils1:2.34-0.1ubuntu4
+bzip21.0.8-2
+ca-certificates20190110
+coreutils8.30-3ubuntu2
+curl7.68.0-1ubuntu1
+dash0.5.10.2-6
+debconf1.5.73
+debianutils4.9.1
+diffutils1:3.7-3
+dirmngr2.2.17-3ubuntu1
+dpkg1.19.7ubuntu2
+e2fsprogs1.45.3-4ubuntu2
+fdisk2.34-0.1ubuntu4
+findutils4.6.0+git+20190209-2ubuntu1
+gcc-10-base10-20200304-1ubuntu1
+gcc-9-base9.2.1-21ubuntu1
+gnupg2.2.17-3ubuntu1
+gnupg-l10n2.2.17-3ubuntu1
+gnupg-utils2.2.17-3ubuntu1
+gpg2.2.17-3ubuntu1
+gpg-agent2.2.17-3ubuntu1
+gpgconf2.2.17-3ubuntu1
+gpgsm2.2.17-3ubuntu1
+gpgv2.2.17-3ubuntu1
+gpg-wks-client2.2.17-3ubuntu1
+gpg-wks-server2.2.17-3ubuntu1
+grep3.3-1build1
+gzip1.10-0ubuntu4
+hostname3.23
+init-system-helpers1.57
+jq1.6-1
+krb5-locales1.17-6ubuntu4
+libacl12.2.53-5ubuntu1
+libapt-pkg5.901.9.10
+libasn1-8-heimdal7.7.0+dfsg-1
+libassuan02.5.3-7ubuntu2
+libattr11:2.4.48-5
+libaudit11:2.8.5-2ubuntu5
+libaudit-common1:2.8.5-2ubuntu5
+libblkid12.34-0.1ubuntu4
+libbrotli11.0.7-6build1
+libbz2-1.01.0.8-2
+libc62.30-0ubuntu3
+libcap-ng00.7.9-2.1
+libc-bin2.30-0ubuntu3
+libcom-err21.45.3-4ubuntu2
+libcurl3-gnutls7.68.0-1ubuntu1
+libcurl47.68.0-1ubuntu1
+libdb5.35.3.28+dfsg1-0.6ubuntu1
+libdebconfclient00.250ubuntu2
+libext2fs21.45.3-4ubuntu2
+libfdisk12.34-0.1ubuntu4
+libffi63.2.1-9
+libgcc11:9.2.1-21ubuntu1
+libgcc-s110-20200304-1ubuntu1
+libgcrypt201.8.5-3ubuntu1
+libgmp102:6.1.2+dfsg-4
+libgnutls303.6.11.1-2
+libgpg-error01.36-7
+libgssapi3-heimdal7.7.0+dfsg-1
+libgssapi-krb5-21.17-6ubuntu4
+libhcrypto4-heimdal7.7.0+dfsg-1
+libheimbase1-heimdal7.7.0+dfsg-1
+libheimntlm0-heimdal7.7.0+dfsg-1
+libhogweed53.5.1+really3.5.1-2
+libhx509-5-heimdal7.7.0+dfsg-1
+libicu6666.1-2ubuntu2
+libidn2-02.2.0-2
+libjq11.6-1
+libk5crypto31.17-6ubuntu4
+libkeyutils11.6-6ubuntu1
+libkrb5-26-heimdal7.7.0+dfsg-1
+libkrb5-31.17-6ubuntu4
+libkrb5support01.17-6ubuntu4
+libksba81.3.5-2
+libldap-2.4-22.4.49+dfsg-1ubuntu1
+libldap-common2.4.49+dfsg-1ubuntu1
+liblz4-11.9.2-2
+liblzma55.2.4-1
+libmediainfo0v519.09+dfsg-2build1
 libmms00.6.4-3
-libmount12.31.1-0.4ubuntu3.4
-libncurses56.1-1ubuntu1.18.04
-libncursesw56.1-1ubuntu1.18.04
-libnettle63.4.1-1
-libnghttp2-141.30.0-1ubuntu1
-libonig56.9.2-1
-libp11-kit00.23.17-2
-libpam0g1.1.8-3.6ubuntu2.18.04.1
-libpam-modules1.1.8-3.6ubuntu2.18.04.1
-libpam-modules-bin1.1.8-3.6ubuntu2.18.04.1
-libpam-runtime1.1.8-3.6ubuntu2.18.04.1
-libpcre32:8.39-9
-libprocps62:3.3.12-3ubuntu1.2
-libpsl50.19.1-5build1
-libreadline88.0-3
-libroken18-heimdal7.5.0+dfsg-1
-librtmp12.4+20151223.gitfa8646d.1-1
-libsasl2-22.1.27~101-g0780600+dfsg-3ubuntu2
-libsasl2-modules2.1.27~101-g0780600+dfsg-3ubuntu2
-libsasl2-modules-db2.1.27~101-g0780600+dfsg-3ubuntu2
-libseccomp22.4.1-0ubuntu0.18.04.2
-libselinux12.7-2build2
-libsemanage12.7-2build2
-libsemanage-common2.7-2build2
-libsepol12.7-1
-libsmartcols12.31.1-0.4ubuntu3.4
-libsqlite3-03.29.0-2ubuntu0.1
-libss21.44.1-1ubuntu1.2
-libssh-40.9.0-1ubuntu1.3
-libssl1.11.1.1-1ubuntu2.1~18.04.5
-libstdc++68.3.0-6ubuntu1~18.04.1
-libsystemd0237-3ubuntu10.33
-libtasn1-64.14-3
-libtinfo56.1-1ubuntu1.18.04
-libtinfo66.1+20190803-1ubuntu1
-libtinyxml2-6a7.0.0+dfsg-1
-libudev1237-3ubuntu10.33
-libunistring20.9.9-0ubuntu2
-libuuid12.31.1-0.4ubuntu3.4
-libwind0-heimdal7.5.0+dfsg-1
-libzen0v50.4.37-1
-libzstd11.3.3+dfsg-2ubuntu1.1
-locales2.30-0ubuntu2
-login1:4.5-1ubuntu2
-lsb-base9.20170808ubuntu1
+libmount12.34-0.1ubuntu4
+libncurses66.1+20191019-1ubuntu1
+libncursesw66.1+20191019-1ubuntu1
+libnettle73.5.1+really3.5.1-2
+libnghttp2-141.40.0-1
+libnpth01.6-1
+libonig56.9.4-1
+libp11-kit00.23.18.1-2
+libpam0g1.3.1-5ubuntu4
+libpam-modules1.3.1-5ubuntu4
+libpam-modules-bin1.3.1-5ubuntu4
+libpam-runtime1.3.1-5ubuntu4
+libpcre2-8-010.34-7
+libpcre32:8.39-12
+libprocps72:3.3.15-2ubuntu3
+libpsl50.20.2-2
+libreadline88.0-4
+libroken18-heimdal7.7.0+dfsg-1
+librtmp12.4+20151223.gitfa8646d.1-2build1
+libsasl2-22.1.27+dfsg-2
+libsasl2-modules2.1.27+dfsg-2
+libsasl2-modules-db2.1.27+dfsg-2
+libseccomp22.4.2-2ubuntu2
+libselinux13.0-1
+libsemanage13.0-1
+libsemanage-common3.0-1
+libsepol13.0-1
+libsmartcols12.34-0.1ubuntu4
+libsqlite3-03.31.1-4
+libss21.45.3-4ubuntu2
+libssh-40.9.3-2ubuntu1
+libssl1.11.1.1d-2ubuntu6
+libstdc++69.2.1-21ubuntu1
+libsystemd0244-3ubuntu1
+libtasn1-64.15.0-2
+libtinfo66.1+20191019-1ubuntu1
+libtinyxml2-6a7.0.0+dfsg-1build1
+libudev1244-3ubuntu1
+libunistring20.9.10-2
+libuuid12.34-0.1ubuntu4
+libwind0-heimdal7.7.0+dfsg-1
+libzen0v50.4.37-1build1
+libzstd11.4.4+dfsg-1
+locales2.30-0ubuntu3
+login1:4.5-1.1ubuntu4
+logsave1.45.3-4ubuntu2
+lsb-base11.1.0ubuntu2
 mawk1.3.3-17ubuntu3
-mount2.31.1-0.4ubuntu3.4
-ncurses-base6.1-1ubuntu1.18.04
-ncurses-bin6.1-1ubuntu1.18.04
-openssl1.1.1-1ubuntu2.1~18.04.5
-passwd1:4.5-1ubuntu2
-perl-base5.26.1-6ubuntu0.3
-procps2:3.3.12-3ubuntu1.2
-publicsuffix20180223.1310-1
-readline-common8.0-3
-sed4.4-2
-sensible-utils0.0.12
-sqlite33.29.0-2ubuntu0.1
-sysvinit-utils2.88dsf-59.10ubuntu1
-tar1.29b-2ubuntu0.1
-tzdata2019c-0ubuntu0.18.04
-ubuntu-keyring2018.09.18.1~18.04.0
-util-linux2.31.1-0.4ubuntu3.4
-zlib1g1:1.2.11.dfsg-0ubuntu2
+mount2.34-0.1ubuntu4
+ncurses-base6.1+20191019-1ubuntu1
+ncurses-bin6.1+20191019-1ubuntu1
+openssl1.1.1d-2ubuntu6
+passwd1:4.5-1.1ubuntu4
+perl-base5.30.0-9
+pinentry-curses1.1.0-3
+procps2:3.3.15-2ubuntu3
+publicsuffix20200201.2258-1
+readline-common8.0-4
+sed4.7-1
+sensible-utils0.0.12+nmu1
+sqlite33.31.1-4
+sysvinit-utils2.96-1ubuntu1
+tar1.30+dfsg-6
+tzdata2019c-3ubuntu1
+ubuntu-keyring2018.09.18.1
+util-linux2.34-0.1ubuntu4
+zlib1g1:1.2.11.dfsg-1ubuntu3
@@ -46,6 +46,7 @@ app_setup_block: |

 # changelog
 changelogs:
+  - { date: "02.20.20:", desc: "Rebase Preview to Focal." }
  - { date: "01.06.20:", desc: "Use Eoan packages for preview branch." }
  - { date: "10.15.19:", desc: "Use Netcore builds for preview branch." }
  - { date: "08.09.19:", desc: "Pull artifacts from new upstream Azure build env." }
@@ -1,9 +1,8 @@
 #!/usr/bin/with-contenv bash

 UMASK_SET=${UMASK_SET:-022}
-
 umask "$UMASK_SET"

 exec \
-	s6-setuidgid abc /opt/radarr/Radarr \
+	s6-setuidgid abc /app/radarr/bin/Radarr \
 	-nobrowser -data=/config
Author	SHA1	Message	Date
Eric NemchikandGitHub	2ee8776cc0	Merge pull request #90 from linuxserver/package_info Move to /app	2020-04-05 01:35:26 -05:00
Eric Nemchik	349825c00a	Move to /app	2020-04-03 22:27:56 -05:00
LinuxServer-CI	8661c73e51	Bot Updating Package Versions	2020-03-31 08:26:14 +00:00
LinuxServer-CI	f38e3bd65b	Bot Updating Package Versions	2020-03-28 17:04:39 -04:00
aptalcaandRyan Kuba	86c98cfec4	update to libicu66	2020-03-28 13:46:27 -07:00
LinuxServer-CI	220d396bdd	Bot Updating Package Versions	2020-03-24 05:33:20 -04:00
LinuxServer-CI	3e287abd3c	Bot Updating Package Versions	2020-03-09 03:39:33 +00:00
LinuxServer-CI	7b4732afb3	Bot Updating Package Versions	2020-03-07 06:39:59 +00:00
LinuxServer-CI	6220c51610	Bot Updating Package Versions	2020-02-29 22:03:46 -05:00
LinuxServer-CI	82048d62ed	Bot Updating Package Versions	2020-02-29 18:26:10 +00:00
Eric NemchikandGitHub	b6d56f1ed0	Merge pull request #83 from linuxserver/depfix lib name change for focal	2020-02-29 12:16:59 -06:00
thelamer	bdfa40bc9c	lib name change for focal	2020-02-29 09:32:15 -08:00
LinuxServer-CI	52e0792c78	Bot Updating Package Versions	2020-02-25 04:27:47 -05:00
LinuxServer-CI	6b3b4a3846	Bot Updating Package Versions	2020-02-23 18:14:49 +00:00
LinuxServer-CI	9dd23cd2cf	Bot Updating Package Versions	2020-02-21 04:32:19 +00:00
thelamer	08bd66203d	typo in changeset	2020-02-20 20:25:43 -08:00
thelamer	ae5a78ac75	rebasing preview to focal	2020-02-20 20:25:43 -08:00
LinuxServer-CI	145296d720	Bot Updating Package Versions	2020-02-19 22:40:35 -05:00
LinuxServer-CI	c61d82b9c8	Bot Updating Package Versions	2020-02-14 21:09:45 -05:00
LinuxServer-CI	6ef10d3bbf	Bot Updating Package Versions	2020-02-11 09:33:23 +00:00
LinuxServer-CI	eb74b92d00	Bot Updating Package Versions	2020-01-30 14:11:22 -05:00