diff --git a/Dockerfile b/Dockerfile index 0dd7542..2d19785 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.19 +FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.20 # set version label ARG BUILD_DATE @@ -70,6 +70,7 @@ RUN \ npm ci --no-audit && \ npm run build && \ rm -rf /app/www/node_modules && \ + printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \ echo "**** cleanup ****" && \ apk del --purge \ build-dependencies && \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index e916155..838468b 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.19 +FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.20 # set version label ARG BUILD_DATE @@ -70,6 +70,7 @@ RUN \ npm ci --no-audit && \ npm run build && \ rm -rf /app/www/node_modules && \ + printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \ echo "**** cleanup ****" && \ apk del --purge \ build-dependencies && \ diff --git a/Jenkinsfile b/Jenkinsfile index ac8cb2d..d9fc98c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -33,9 +33,9 @@ pipeline { CI_WEB='true' CI_PORT='80' CI_SSL='false' - CI_DELAY='120' - CI_DOCKERENV='TZ=Europe/London|DB_CONNECTION=sqlite' - CI_AUTH='user:password' + CI_DELAY='60' + CI_DOCKERENV='DB_CONNECTION=sqlite' + CI_AUTH='' CI_WEBPATH='' } stages { diff --git a/README.md b/README.md index 5fa1294..50c6d35 100644 --- a/README.md +++ b/README.md @@ -322,6 +322,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **27.05.24:** - Rebase to Alpine 3.20. Existing users should update: site-confs/default.conf to avoid http2 deprecation warnings. * **18.01.24:** - Add php-sodium. * **13.01.24:** - Rebase to Alpine 3.19 with php 8.3. * **27.12.23:** - Update image to support v5. diff --git a/jenkins-vars.yml b/jenkins-vars.yml index 46fd903..5a2aec2 100644 --- a/jenkins-vars.yml +++ b/jenkins-vars.yml @@ -6,7 +6,6 @@ external_type: github_stable release_type: stable release_tag: latest ls_branch: master -build_armhf: false repo_vars: - EXT_GIT_BRANCH = 'master' - EXT_USER = 'LycheeOrg' @@ -24,7 +23,7 @@ repo_vars: - CI_WEB='true' - CI_PORT='80' - CI_SSL='false' - - CI_DELAY='120' - - CI_DOCKERENV='TZ=Europe/London|DB_CONNECTION=sqlite' - - CI_AUTH='user:password' + - CI_DELAY='60' + - CI_DOCKERENV='DB_CONNECTION=sqlite' + - CI_AUTH='' - CI_WEBPATH='' diff --git a/readme-vars.yml b/readme-vars.yml index 0e3a16f..70f0fb0 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -67,6 +67,7 @@ app_setup_block: | # changelog changelogs: + - { date: "27.05.24:", desc: "Rebase to Alpine 3.20. Existing users should update their nginx confs to avoid http2 deprecation warnings."} - { date: "18.01.24:", desc: "Add php-sodium."} - { date: "13.01.24:", desc: "Rebase to Alpine 3.19 with php 8.3."} - { date: "27.12.23:", desc: "Update image to support v5." } diff --git a/root/defaults/nginx/site-confs/default.conf.sample b/root/defaults/nginx/site-confs/default.conf.sample index e614d0b..1d154fd 100644 --- a/root/defaults/nginx/site-confs/default.conf.sample +++ b/root/defaults/nginx/site-confs/default.conf.sample @@ -1,11 +1,8 @@ -## Version 2023/12/25 - Changelog: https://github.com/linuxserver/docker-lychee/commits/master/root/defaults/nginx/site-confs/default.conf.sample +## Version 2024/05/27 - Changelog: https://github.com/linuxserver/docker-lychee/commits/master/root/defaults/nginx/site-confs/default.conf.sample server { - listen 80 default_server; - listen [::]:80 default_server; - - listen 443 ssl http2 default_server; - listen [::]:443 ssl http2 default_server; + listen *:80 default_server; + listen *:443 ssl default_server; server_name _; diff --git a/root/etc/s6-overlay/s6-rc.d/init-lychee-config/run b/root/etc/s6-overlay/s6-rc.d/init-lychee-config/run index 4c55964..7007a6a 100755 --- a/root/etc/s6-overlay/s6-rc.d/init-lychee-config/run +++ b/root/etc/s6-overlay/s6-rc.d/init-lychee-config/run @@ -11,7 +11,7 @@ if [[ ! "$(ls -A /pictures)" ]]; then mv /app/www/public/uploads/* /pictures/ lsiown -R abc:abc /pictures elif [[ ! "$(ls -A /pictures/import 2>/dev/null)" ]]; then - printf "\n\n\n\nSeems like you tried to use a path thats not managed by lychee, this is unsupported\n\n\n\n" + printf "\n\n\n\nSeems like you tried to use a path that's not managed by lychee, this is unsupported\n\n\n\n" fi if [[ ! -L /app/www/public/uploads ]]; then