From 62d13eaf3b868325704833f5465ce4467d7a16bb Mon Sep 17 00:00:00 2001 From: thespad Date: Mon, 24 Jun 2024 20:36:45 +0100 Subject: [PATCH] Rebase to 3.20 --- Dockerfile | 6 +++--- Dockerfile.aarch64 | 6 +++--- Jenkinsfile | 4 ++-- README.md | 1 + jenkins-vars.yml | 5 ++--- readme-vars.yml | 16 +--------------- .../nginx/site-confs/default.conf.sample | 9 +++------ 7 files changed, 15 insertions(+), 32 deletions(-) diff --git a/Dockerfile b/Dockerfile index 0de128b..b0d1ac9 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 @@ -36,6 +36,7 @@ RUN \ php83-pdo_pgsql \ php83-pdo_sqlite \ php83-pecl-imagick \ + php83-pecl-mcrypt \ php83-pecl-memcached \ php83-pecl-smbclient \ php83-pgsql \ @@ -48,8 +49,6 @@ RUN \ rsync \ samba-client \ sudo && \ - apk add --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/community \ - php83-pecl-mcrypt && \ echo "**** configure php-fpm to pass env vars ****" && \ sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php83/php-fpm.d/www.conf && \ grep -qxF 'clear_env = no' /etc/php83/php-fpm.d/www.conf || echo 'clear_env = no' >> /etc/php83/php-fpm.d/www.conf && \ @@ -93,6 +92,7 @@ RUN \ rm -rf /app/www/src/updater && \ mkdir -p /app/www/src/data && \ chmod +x /app/www/src/occ && \ + printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \ echo "**** cleanup ****" && \ rm -rf \ /tmp/* diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 30079c8..e5a6cb0 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 @@ -36,6 +36,7 @@ RUN \ php83-pdo_pgsql \ php83-pdo_sqlite \ php83-pecl-imagick \ + php83-pecl-mcrypt \ php83-pecl-memcached \ php83-pecl-smbclient \ php83-pgsql \ @@ -48,8 +49,6 @@ RUN \ rsync \ samba-client \ sudo && \ - apk add --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/community \ - php83-pecl-mcrypt && \ echo "**** configure php-fpm to pass env vars ****" && \ sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php83/php-fpm.d/www.conf && \ grep -qxF 'clear_env = no' /etc/php83/php-fpm.d/www.conf || echo 'clear_env = no' >> /etc/php83/php-fpm.d/www.conf && \ @@ -93,6 +92,7 @@ RUN \ rm -rf /app/www/src/updater && \ mkdir -p /app/www/src/data && \ chmod +x /app/www/src/occ && \ + printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \ echo "**** cleanup ****" && \ rm -rf \ /tmp/* diff --git a/Jenkinsfile b/Jenkinsfile index 14f9cc4..ebe0c4b 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -31,8 +31,8 @@ pipeline { CI_PORT='443' CI_SSL='true' CI_DELAY='120' - CI_DOCKERENV='TZ=US/Pacific' - CI_AUTH='user:password' + CI_DOCKERENV='' + CI_AUTH='' CI_WEBPATH='' } stages { diff --git a/README.md b/README.md index aae2ed4..bf5e4dc 100644 --- a/README.md +++ b/README.md @@ -315,6 +315,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **24.06.24:** - Rebase to Alpine 3.20. Existing users should update their nginx confs to avoid http2 deprecation warnings. * **06.03.24:** - Rebase to Alpine 3.19 with php 8.3. * **02.01.24:** - Existing users should update: site-confs/default.conf - Cleanup default site conf. * **22.12.23:** - Site default conf updating to include mime.types for js and mjs and update location to include more file types. diff --git a/jenkins-vars.yml b/jenkins-vars.yml index 218bf12..d63f524 100644 --- a/jenkins-vars.yml +++ b/jenkins-vars.yml @@ -7,7 +7,6 @@ custom_version_command: "curl -sX GET https://api.github.com/repos/nextcloud/ser release_type: prerelease release_tag: develop ls_branch: develop -build_armhf: false repo_vars: - BUILD_VERSION_ARG = 'NEXTCLOUD_RELEASE' - LS_USER = 'linuxserver' @@ -23,6 +22,6 @@ repo_vars: - CI_PORT='443' - CI_SSL='true' - CI_DELAY='120' - - CI_DOCKERENV='TZ=US/Pacific' - - CI_AUTH='user:password' + - CI_DOCKERENV='' + - CI_AUTH='' - CI_WEBPATH='' diff --git a/readme-vars.yml b/readme-vars.yml index 171546a..ebc98ab 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -9,7 +9,6 @@ project_blurb: | Where are your photos and documents? With Nextcloud you pick a server of your choice, at home, in a data center or at a provider. And that is where your files will be. Nextcloud runs on that server, protecting your data and giving you access from your desktop or mobile devices. Through Nextcloud you also access, sync and share your existing data on that FTP drive at the office, a Dropbox or a NAS you have at home. project_lsio_github_repo_url: "https://github.com/linuxserver/docker-{{ project_name }}" -project_blurb_optional_extras_enabled: false # supported architectures available_architectures: @@ -25,10 +24,6 @@ development_versions_items: # container parameters common_param_env_vars_enabled: true param_container_name: "{{ project_name }}" -param_usage_include_net: false -param_usage_include_env: true -param_env_vars: - - { env_var: "TZ", env_value: "Europe/London", desc: "Specify a timezone to use EG Europe/London." } param_usage_include_vols: true param_volumes: - { vol_path: "/config", vol_host_path: "/path/to/{{ project_name }}/config", desc: "Persistent config files" } @@ -36,16 +31,6 @@ param_volumes: param_usage_include_ports: true param_ports: - { external_port: "443", internal_port: "443", port_desc: "WebUI" } -param_device_map: false -cap_add_param: false - -# optional container parameters -opt_param_usage_include_env: false -opt_param_usage_include_vols: false -opt_param_usage_include_ports: false -opt_param_device_map: false -opt_cap_add_param: false -optional_block_1: false # application setup block app_setup_block_enabled: true @@ -79,6 +64,7 @@ app_setup_block: | # changelog changelogs: + - { date: "24.06.24:", desc: "Rebase to Alpine 3.20. Existing users should update their nginx confs to avoid http2 deprecation warnings."} - { date: "06.03.24:", desc: "Rebase to Alpine 3.19 with php 8.3."} - { date: "02.01.24:", desc: "Existing users should update: site-confs/default.conf - Cleanup default site conf." } - { date: "22.12.23:", desc: "Site default conf updating to include mime.types for js and mjs and update location to include more file types." } diff --git a/root/defaults/nginx/site-confs/default.conf.sample b/root/defaults/nginx/site-confs/default.conf.sample index d036ea9..1c4c92e 100644 --- a/root/defaults/nginx/site-confs/default.conf.sample +++ b/root/defaults/nginx/site-confs/default.conf.sample @@ -1,4 +1,4 @@ -## Version 2024/01/03 - Changelog: https://github.com/linuxserver/docker-nextcloud/commits/master/root/defaults/nginx/site-confs/default.conf.sample +## Version 2024/06/24 - Changelog: https://github.com/linuxserver/docker-nextcloud/commits/master/root/defaults/nginx/site-confs/default.conf.sample # Set the `immutable` cache control options only for assets with a cache busting `v` argument map $arg_v $asset_immutable { @@ -7,11 +7,8 @@ map $arg_v $asset_immutable { } 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 _;