From a7c3e50f357e1f043bb42cc83d742b0be950a61e Mon Sep 17 00:00:00 2001 From: Eric Nemchik Date: Mon, 11 Mar 2024 11:24:35 -0500 Subject: [PATCH] Rebase to Alpine 3.19 (#398) * Rebase to Alpine 3.19 Signed-off-by: Eric Nemchik * update date and edge repo --------- Signed-off-by: Eric Nemchik Co-authored-by: aptalca <541623+aptalca@users.noreply.github.com> --- Dockerfile | 68 +++++++++++++++++++++++----------------------- Dockerfile.aarch64 | 68 +++++++++++++++++++++++----------------------- readme-vars.yml | 3 +- 3 files changed, 70 insertions(+), 69 deletions(-) diff --git a/Dockerfile b/Dockerfile index acb3774..a65b833 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 @@ -19,45 +19,45 @@ RUN \ gnu-libiconv \ imagemagick \ libxml2 \ - php82-apcu \ - php82-bcmath \ - php82-bz2 \ - php82-dom \ - php82-exif \ - php82-ftp \ - php82-gd \ - php82-gmp \ - php82-imap \ - php82-intl \ - php82-ldap \ - php82-opcache \ - php82-pcntl \ - php82-pdo_mysql \ - php82-pdo_pgsql \ - php82-pdo_sqlite \ - php82-pecl-imagick \ - php82-pecl-memcached \ - php82-pecl-smbclient \ - php82-pgsql \ - php82-posix \ - php82-redis \ - php82-sodium \ - php82-sqlite3 \ - php82-sysvsem \ - php82-xmlreader \ + php83-apcu \ + php83-bcmath \ + php83-bz2 \ + php83-dom \ + php83-exif \ + php83-ftp \ + php83-gd \ + php83-gmp \ + php83-imap \ + php83-intl \ + php83-ldap \ + php83-opcache \ + php83-pcntl \ + php83-pdo_mysql \ + php83-pdo_pgsql \ + php83-pdo_sqlite \ + php83-pecl-imagick \ + php83-pecl-memcached \ + php83-pecl-smbclient \ + php83-pgsql \ + php83-posix \ + php83-redis \ + php83-sodium \ + php83-sqlite3 \ + php83-sysvsem \ + php83-xmlreader \ rsync \ samba-client \ sudo && \ apk add --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/community \ - php82-pecl-mcrypt && \ + php83-pecl-mcrypt && \ echo "**** configure php-fpm to pass env vars ****" && \ - sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php82/php-fpm.d/www.conf && \ - grep -qxF 'clear_env = no' /etc/php82/php-fpm.d/www.conf || echo 'clear_env = no' >> /etc/php82/php-fpm.d/www.conf && \ - echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php82/php-fpm.conf && \ + 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 && \ + echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php83/php-fpm.conf && \ echo "**** configure php for nextcloud ****" && \ { \ echo 'apc.enable_cli=1'; \ - } >> /etc/php82/conf.d/apcu.ini && \ + } >> /etc/php83/conf.d/apcu.ini && \ { \ echo 'opcache.enable=1'; \ echo 'opcache.interned_strings_buffer=32'; \ @@ -67,7 +67,7 @@ RUN \ echo 'opcache.revalidate_freq=60'; \ echo 'opcache.jit=1255'; \ echo 'opcache.jit_buffer_size=128M'; \ - } >> "/etc/php82/conf.d/00_opcache.ini" && \ + } >> "/etc/php83/conf.d/00_opcache.ini" && \ { \ echo 'memory_limit=512M'; \ echo 'upload_max_filesize=512M'; \ @@ -76,7 +76,7 @@ RUN \ echo 'max_execution_time=300'; \ echo 'output_buffering=0'; \ echo 'always_populate_raw_post_data=-1'; \ - } >> "/etc/php82/conf.d/nextcloud.ini" && \ + } >> "/etc/php83/conf.d/nextcloud.ini" && \ echo "**** install nextcloud ****" && \ mkdir -p \ /app/www/src/ && \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index e6fde3b..30682ae 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 @@ -19,45 +19,45 @@ RUN \ gnu-libiconv \ imagemagick \ libxml2 \ - php82-apcu \ - php82-bcmath \ - php82-bz2 \ - php82-dom \ - php82-exif \ - php82-ftp \ - php82-gd \ - php82-gmp \ - php82-imap \ - php82-intl \ - php82-ldap \ - php82-opcache \ - php82-pcntl \ - php82-pdo_mysql \ - php82-pdo_pgsql \ - php82-pdo_sqlite \ - php82-pecl-imagick \ - php82-pecl-memcached \ - php82-pecl-smbclient \ - php82-pgsql \ - php82-posix \ - php82-redis \ - php82-sodium \ - php82-sqlite3 \ - php82-sysvsem \ - php82-xmlreader \ + php83-apcu \ + php83-bcmath \ + php83-bz2 \ + php83-dom \ + php83-exif \ + php83-ftp \ + php83-gd \ + php83-gmp \ + php83-imap \ + php83-intl \ + php83-ldap \ + php83-opcache \ + php83-pcntl \ + php83-pdo_mysql \ + php83-pdo_pgsql \ + php83-pdo_sqlite \ + php83-pecl-imagick \ + php83-pecl-memcached \ + php83-pecl-smbclient \ + php83-pgsql \ + php83-posix \ + php83-redis \ + php83-sodium \ + php83-sqlite3 \ + php83-sysvsem \ + php83-xmlreader \ rsync \ samba-client \ sudo && \ apk add --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/community \ - php82-pecl-mcrypt && \ + php83-pecl-mcrypt && \ echo "**** configure php-fpm to pass env vars ****" && \ - sed -E -i 's/^;?clear_env ?=.*$/clear_env = no/g' /etc/php82/php-fpm.d/www.conf && \ - grep -qxF 'clear_env = no' /etc/php82/php-fpm.d/www.conf || echo 'clear_env = no' >> /etc/php82/php-fpm.d/www.conf && \ - echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php82/php-fpm.conf && \ + 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 && \ + echo "env[PATH] = /usr/local/bin:/usr/bin:/bin" >> /etc/php83/php-fpm.conf && \ echo "**** configure php for nextcloud ****" && \ { \ echo 'apc.enable_cli=1'; \ - } >> /etc/php82/conf.d/apcu.ini && \ + } >> /etc/php83/conf.d/apcu.ini && \ { \ echo 'opcache.enable=1'; \ echo 'opcache.interned_strings_buffer=32'; \ @@ -67,7 +67,7 @@ RUN \ echo 'opcache.revalidate_freq=60'; \ echo 'opcache.jit=1255'; \ echo 'opcache.jit_buffer_size=128M'; \ - } >> "/etc/php82/conf.d/00_opcache.ini" && \ + } >> "/etc/php83/conf.d/00_opcache.ini" && \ { \ echo 'memory_limit=512M'; \ echo 'upload_max_filesize=512M'; \ @@ -76,7 +76,7 @@ RUN \ echo 'max_execution_time=300'; \ echo 'output_buffering=0'; \ echo 'always_populate_raw_post_data=-1'; \ - } >> "/etc/php82/conf.d/nextcloud.ini" && \ + } >> "/etc/php83/conf.d/nextcloud.ini" && \ echo "**** install nextcloud ****" && \ mkdir -p \ /app/www/src/ && \ diff --git a/readme-vars.yml b/readme-vars.yml index e712a25..0a9223e 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -31,7 +31,7 @@ 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/appdata", desc: "Nextcloud configs." } + - { 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: "Your personal data." } param_usage_include_ports: true param_ports: @@ -81,6 +81,7 @@ app_setup_block: | # changelog changelogs: + - { 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." } - { date: "28.10.23:", desc: "Disable web upgrades using occ during init." }