Bot Updating Package Versions

fix path

Dockerfile

@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.12
+FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.14
 
 # set version label
 ARG BUILD_DATE
@@ -20,8 +20,7 @@ RUN \
 	php7-pdo_sqlite \
 	php7-pdo_mysql \
 	php7-tokenizer \
-	php7-zip \
+	php7-zip && \
-	tar && \
  echo "**** install heimdall ****" && \
  mkdir -p \
 	/heimdall && \

Dockerfile.aarch64

@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.12
+FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.14
 
 # set version label
 ARG BUILD_DATE
@@ -20,8 +20,7 @@ RUN \
 	php7-pdo_sqlite \
 	php7-pdo_mysql \
 	php7-tokenizer \
-	php7-zip \
+	php7-zip && \
-	tar && \
  echo "**** install heimdall ****" && \
  mkdir -p \
 	/heimdall && \

Dockerfile.armhf

@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm32v7-3.12
+FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm32v7-3.14
 
 # set version label
 ARG BUILD_DATE
@@ -20,8 +20,7 @@ RUN \
 	php7-pdo_sqlite \
 	php7-pdo_mysql \
 	php7-tokenizer \
-	php7-zip \
+	php7-zip && \
-	tar && \
  echo "**** install heimdall ****" && \
  mkdir -p \
 	/heimdall && \

README.md

@@ -240,6 +240,8 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **13.03.21:** - Make searchproviders.yaml user configurable.
+* **11.03.21:** - Rebase to alpine 3.14.
 * **10.02.21:** - Revert to alpine 3.12 as php 7.4 broke laravel.
 * **10.02.21:** - Rebasing to alpine 3.13.
 * **17.08.20:** - Add php7-curl.

package_versions.txt

@@ -1,79 +1,83 @@
-alpine-baselayout-3.2.0-r7
+alpine-baselayout-3.2.0-r16
 alpine-keys-2.4-r0
-apache2-utils-2.4.52-r0
+apache2-utils-2.4.53-r0
-apk-tools-2.10.8-r1
+apk-tools-2.12.7-r0
 apr-1.7.0-r0
-apr-util-1.6.1-r6
+apr-util-1.6.1-r7
 argon2-libs-20190702-r1
-bash-5.0.17-r0
+bash-5.1.16-r0
-busybox-1.31.1-r21
+brotli-libs-1.0.9-r5
+busybox-1.33.1-r7
 ca-certificates-20211220-r0
 ca-certificates-bundle-20211220-r0
-coreutils-8.32-r0
+coreutils-8.32-r2
 curl-7.79.1-r0
-db-5.3.28-r1
+expat-2.4.7-r0
-expat-2.2.10-r0
+gdbm-1.19-r0
-git-2.26.3-r0
+git-2.32.0-r0
 libacl-2.2.53-r0
-libattr-2.4.48-r0
+libattr-2.5.1-r0
 libc-utils-0.7.2-r3
-libcrypto1.1-1.1.1l-r0
+libcrypto1.1-1.1.1n-r0
 libcurl-7.79.1-r0
-libedit-20191231.3.1-r0
+libedit-20210216.3.1-r0
-libintl-0.20.2-r0
+libintl-0.21-r0
-libldap-2.4.50-r2
+libldap-2.4.58-r0
-libmagic-5.38-r0
+libmagic-5.40-r1
-libpq-12.10-r0
+libpq-13.6-r0
-libproc-3.3.16-r0
+libproc-3.3.17-r0
-libressl3.1-libcrypto-3.1.2-r0
+libressl3.3-libcrypto-3.3.6-r0
-libressl3.1-libssl-3.1.2-r0
+libressl3.3-libssl-3.3.6-r0
-libsasl-2.1.27-r6
+libretls-3.3.3p1-r3
-libssl1.1-1.1.1l-r0
+libsasl-2.1.28-r0
-libtls-standalone-2.9.1-r1
+libssl1.1-1.1.1n-r0
 libuuid-2.37.4-r0
-libxml2-2.9.12-r0
+libxml2-2.9.13-r0
-libzip-1.6.1-r1
+libzip-1.7.3-r2
-linux-pam-1.3.1-r4
+linux-pam-1.5.1-r1
-logrotate-3.16.0-r1
+logrotate-3.18.1-r1
-musl-1.1.24-r10
+musl-1.2.2-r3
-musl-utils-1.1.24-r10
+musl-utils-1.2.2-r3
-nano-4.9.3-r0
+nano-5.7-r2
-ncurses-libs-6.2_p20200523-r1
+ncurses-libs-6.2_p20210612-r0
-ncurses-terminfo-base-6.2_p20200523-r1
+ncurses-terminfo-base-6.2_p20210612-r0
-nghttp2-libs-1.41.0-r0
+nghttp2-libs-1.43.0-r0
-nginx-1.18.0-r3
+nginx-1.20.2-r0
-openssl-1.1.1l-r0
+oniguruma-6.9.7.1-r0
+openssl-1.1.1n-r0
 pcre-8.44-r0
-pcre2-10.35-r0
+pcre2-10.36-r0
-php7-7.3.33-r0
+php7-7.4.26-r0
-php7-common-7.3.33-r0
+php7-common-7.4.26-r0
-php7-ctype-7.3.33-r0
+php7-ctype-7.4.26-r0
-php7-curl-7.3.33-r0
+php7-curl-7.4.26-r0
-php7-fileinfo-7.3.33-r0
+php7-fileinfo-7.4.26-r0
-php7-fpm-7.3.33-r0
+php7-fpm-7.4.26-r0
-php7-json-7.3.33-r0
+php7-json-7.4.26-r0
-php7-mbstring-7.3.33-r0
+php7-mbstring-7.4.26-r0
-php7-mysqlnd-7.3.33-r0
+php7-mysqlnd-7.4.26-r0
-php7-openssl-7.3.33-r0
+php7-openssl-7.4.26-r0
-php7-pdo-7.3.33-r0
+php7-pdo-7.4.26-r0
-php7-pdo_mysql-7.3.33-r0
+php7-pdo_mysql-7.4.26-r0
-php7-pdo_pgsql-7.3.33-r0
+php7-pdo_pgsql-7.4.26-r0
-php7-pdo_sqlite-7.3.33-r0
+php7-pdo_sqlite-7.4.26-r0
-php7-session-7.3.33-r0
+php7-session-7.4.26-r0
-php7-simplexml-7.3.33-r0
+php7-simplexml-7.4.26-r0
-php7-tokenizer-7.3.33-r0
+php7-tokenizer-7.4.26-r0
-php7-xml-7.3.33-r0
+php7-xml-7.4.26-r0
-php7-xmlwriter-7.3.33-r0
+php7-xmlwriter-7.4.26-r0
-php7-zip-7.3.33-r0
+php7-zip-7.4.26-r0
-popt-1.16-r7
+popt-1.18-r0
-procps-3.3.16-r0
+procps-3.3.17-r0
-readline-8.0.4-r0
+readline-8.1.0-r0
-scanelf-1.2.6-r0
+s6-ipcserver-2.10.0.3-r0
+scanelf-1.3.2-r0
 shadow-4.8.1-r0
-sqlite-libs-3.32.1-r1
+skalibs-2.10.0.3-r0
-ssl_client-1.31.1-r21
+sqlite-libs-3.35.5-r0
-tar-1.32-r2
+ssl_client-1.33.1-r7
-tzdata-2021e-r0
+tzdata-2022a-r0
+utmps-0.1.0.2-r0
 xz-5.2.5-r0
-xz-libs-5.2.5-r0
+xz-libs-5.2.5-r1
-zlib-1.2.11-r3
+zlib-1.2.12-r0

readme-vars.yml

@@ -49,6 +49,8 @@ app_setup_block: |
 
 # changelog
 changelogs:
+  - { date: "13.03.21:", desc: "Make searchproviders.yaml user configurable." }
+  - { date: "11.03.21:", desc: "Rebase to alpine 3.14." }
   - { date: "10.02.21:", desc: "Revert to alpine 3.12 as php 7.4 broke laravel." }
   - { date: "10.02.21:", desc: "Rebasing to alpine 3.13." }
   - { date: "17.08.20:", desc: "Add php7-curl." }

root/etc/cont-init.d/50-config

@@ -15,6 +15,7 @@ mkdir -p \
  echo -e '\n# Heimdall user authorization\nfastcgi_param  PHP_AUTH_USER $remote_user;\nfastcgi_param  PHP_AUTH_PW $http_authorization;' >> \
 	/etc/nginx/fastcgi_params && \
  rm -rf /heimdall && \
+ cp /var/www/localhost/heimdall/storage/app/searchproviders.yaml /var/www/localhost/heimdall/storage/app/searchproviders.yaml.orig && \
  chown -R abc:abc /var/www/localhost/heimdall
 
 # create symlinks
@@ -43,6 +44,11 @@ done
   cp /var/www/localhost/heimdall/.env.example /config/www/.env && \
   echo "Creating app key. This may take a while on slower systems" && \
   php /var/www/localhost/heimdall/artisan key:generate
+# copy searchproviders if not exists and symlink
+[[ ! -f /config/www/searchproviders.yaml ]] && \
+  cp /var/www/localhost/heimdall/storage/app/searchproviders.yaml.orig /config/www/searchproviders.yaml
+rm -rf /var/www/localhost/heimdall/storage/app/searchproviders.yaml
+ln -s /config/www/searchproviders.yaml /var/www/localhost/heimdall/storage/app/searchproviders.yaml
 # set queue driver to database
 sed -i 's/QUEUE_DRIVER=sync/QUEUE_DRIVER=database/' /config/www/.env