From d10059a7a61e45313dad1464ade01fd756ac0cb2 Mon Sep 17 00:00:00 2001 From: Eric Nemchik Date: Sat, 23 Dec 2023 18:10:58 -0600 Subject: [PATCH 1/2] Rebase to Alpine 3.19 Signed-off-by: Eric Nemchik --- Dockerfile | 36 +++++++++---------- Dockerfile.aarch64 | 36 +++++++++---------- readme-vars.yml | 5 +-- root/etc/php83/conf.d/projectsend.ini | 6 ++++ .../s6-rc.d/init-projectsend-config/run | 2 +- 5 files changed, 46 insertions(+), 39 deletions(-) create mode 100644 root/etc/php83/conf.d/projectsend.ini diff --git a/Dockerfile b/Dockerfile index 73800e4..c9df1cb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.18 +FROM ghcr.io/linuxserver/baseimage-alpine-nginx:3.19 # set version label ARG BUILD_DATE @@ -12,23 +12,23 @@ LABEL maintainer="TheSpad" RUN \ echo "**** install runtime packages ****" && \ apk add --no-cache \ - php82-bcmath \ - php82-bz2 \ - php82-cli \ - php82-dom \ - php82-gd \ - php82-gettext \ - php82-gmp \ - php82-mysqli \ - php82-pdo \ - php82-pdo_dblib \ - php82-pdo_mysql \ - php82-pecl-apcu \ - php82-pecl-memcached \ - php82-soap \ - php82-xmlreader && \ - apk add --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/community \ - php82-pecl-mcrypt && \ + php83-bcmath \ + php83-bz2 \ + php83-cli \ + php83-dom \ + php83-gd \ + php83-gettext \ + php83-gmp \ + php83-mysqli \ + php83-pdo \ + php83-pdo_dblib \ + php83-pdo_mysql \ + php83-pecl-apcu \ + php83-pecl-memcached \ + php83-soap \ + php83-xmlreader && \ + apk add --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/testing \ + php83-pecl-mcrypt && \ echo "**** install projectsend ****" && \ mkdir -p /app/www/public && \ if [ -z ${PROJECTSEND_VERSION+x} ]; then \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 087cf03..8354978 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.18 +FROM ghcr.io/linuxserver/baseimage-alpine-nginx:arm64v8-3.19 # set version label ARG BUILD_DATE @@ -12,23 +12,23 @@ LABEL maintainer="TheSpad" RUN \ echo "**** install runtime packages ****" && \ apk add --no-cache \ - php82-bcmath \ - php82-bz2 \ - php82-cli \ - php82-dom \ - php82-gd \ - php82-gettext \ - php82-gmp \ - php82-mysqli \ - php82-pdo \ - php82-pdo_dblib \ - php82-pdo_mysql \ - php82-pecl-apcu \ - php82-pecl-memcached \ - php82-soap \ - php82-xmlreader && \ - apk add --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/community \ - php82-pecl-mcrypt && \ + php83-bcmath \ + php83-bz2 \ + php83-cli \ + php83-dom \ + php83-gd \ + php83-gettext \ + php83-gmp \ + php83-mysqli \ + php83-pdo \ + php83-pdo_dblib \ + php83-pdo_mysql \ + php83-pecl-apcu \ + php83-pecl-memcached \ + php83-soap \ + php83-xmlreader && \ + apk add --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/testing \ + php83-pecl-mcrypt && \ echo "**** install projectsend ****" && \ mkdir -p /app/www/public && \ if [ -z ${PROJECTSEND_VERSION+x} ]; then \ diff --git a/readme-vars.yml b/readme-vars.yml index 9b9d3fc..0761dae 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -26,8 +26,8 @@ param_env_vars: - { env_var: "MAX_UPLOAD", env_value: "5000", desc: "To set maximum upload size (in MB), default if unset is 5000." } param_usage_include_vols: true param_volumes: - - { vol_path: "/config", vol_host_path: "", desc: "Where to store projectsend config files." } - - { vol_path: "/data", vol_host_path: "", desc: "Where to store files to share." } + - { vol_path: "/config", vol_host_path: "/path/to/{{ project_name }}/config", desc: "Persistent config files" } + - { vol_path: "/data", vol_host_path: "/path/to/data", desc: "Where to store files to share." } param_usage_include_ports: true param_ports: - { external_port: "80", internal_port: "80", port_desc: "WebUI" } @@ -55,6 +55,7 @@ app_setup_block: | # changelog changelogs: + - { date: "23.12.23:", desc: "Rebase to Alpine 3.19 with php 8.3."} - { date: "25.05.23:", desc: "Rebase to Alpine 3.18, deprecate armhf." } - { date: "08.03.23:", desc: "Rebasing to alpine 3.17 and upgrading to s6v3." } - { date: "23.08.22:", desc: "Add translation support"} diff --git a/root/etc/php83/conf.d/projectsend.ini b/root/etc/php83/conf.d/projectsend.ini new file mode 100644 index 0000000..334a864 --- /dev/null +++ b/root/etc/php83/conf.d/projectsend.ini @@ -0,0 +1,6 @@ +[PHP] +memory_limit = 512M +upload_max_filesize = 5000M +max_file_uploads = 200 +post_max_size = 5000M +cgi.fix_pathinfo= 0 diff --git a/root/etc/s6-overlay/s6-rc.d/init-projectsend-config/run b/root/etc/s6-overlay/s6-rc.d/init-projectsend-config/run index 9915757..19fe391 100755 --- a/root/etc/s6-overlay/s6-rc.d/init-projectsend-config/run +++ b/root/etc/s6-overlay/s6-rc.d/init-projectsend-config/run @@ -25,7 +25,7 @@ sed -i \ -e "s#;*max_file_uploads =.*#max_file_uploads = ${PHP_MAX_FILE_UPLOAD}#i" \ -e "s#;*post_max_size =.*#post_max_size = ${USABLE_MAX_UPLOAD}M#i" \ -e "s#;*cgi.fix_pathinfo=.*#cgi.fix_pathinfo= 0#i" \ - /etc/php82/php.ini + /etc/php83/conf.d/projectsend.ini # copy config PREV_DIR=$(pwd) From d06b3f091c35e4af676a73b860b6b5961cde788f Mon Sep 17 00:00:00 2001 From: Eric Nemchik Date: Sat, 23 Dec 2023 18:24:18 -0600 Subject: [PATCH 2/2] full path comment above to help visibility when searching for php versions Signed-off-by: Eric Nemchik --- root/etc/php83/conf.d/projectsend.ini | 2 ++ 1 file changed, 2 insertions(+) diff --git a/root/etc/php83/conf.d/projectsend.ini b/root/etc/php83/conf.d/projectsend.ini index 334a864..463e7cf 100644 --- a/root/etc/php83/conf.d/projectsend.ini +++ b/root/etc/php83/conf.d/projectsend.ini @@ -1,3 +1,5 @@ +; /etc/php83/conf.d/projectsend.ini +; full path comment above to help visibility when searching for php versions [PHP] memory_limit = 512M upload_max_filesize = 5000M