Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rebase to Alpine 3.19 #41

Merged
merged 1 commit into from
Jan 27, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 14 additions & 14 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -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

ARG BUILD_DATE
ARG VERSION
Expand All @@ -12,27 +12,27 @@ RUN \
echo "**** install runtime packages ****" && \
apk add --no-cache \
busybox-suid \
php82-dom \
php82-gd \
php82-intl \
php82-ldap \
php82-opcache \
php82-pecl-apcu \
php82-pecl-yaml \
php82-redis \
php82-tokenizer && \
php83-dom \
php83-gd \
php83-intl \
php83-ldap \
php83-opcache \
php83-pecl-apcu \
php83-pecl-yaml \
php83-redis \
php83-tokenizer && \
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 "**** setup php opcache ****" && \
{ \
echo 'opcache.memory_consumption=128'; \
echo 'opcache.interned_strings_buffer=8'; \
echo 'opcache.max_accelerated_files=4000'; \
echo 'opcache.revalidate_freq=2'; \
echo 'opcache.enable_cli=1'; \
} > /etc/php82/conf.d/php-opcache.ini && \
} > /etc/php83/conf.d/php-opcache.ini && \
if [ -z ${GRAV_RELEASE+x} ]; then \
GRAV_RELEASE=$(curl -sX GET "https://api.github.com/repos/getgrav/grav/releases/latest" \
| awk '/tag_name/{print $4;exit}' FS='[""]'); \
Expand Down
28 changes: 14 additions & 14 deletions Dockerfile.aarch64
Original file line number Diff line number Diff line change
@@ -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

ARG BUILD_DATE
ARG VERSION
Expand All @@ -12,27 +12,27 @@ RUN \
echo "**** install runtime packages ****" && \
apk add --no-cache \
busybox-suid \
php82-dom \
php82-gd \
php82-intl \
php82-ldap \
php82-opcache \
php82-pecl-apcu \
php82-pecl-yaml \
php82-redis \
php82-tokenizer && \
php83-dom \
php83-gd \
php83-intl \
php83-ldap \
php83-opcache \
php83-pecl-apcu \
php83-pecl-yaml \
php83-redis \
php83-tokenizer && \
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 "**** setup php opcache ****" && \
{ \
echo 'opcache.memory_consumption=128'; \
echo 'opcache.interned_strings_buffer=8'; \
echo 'opcache.max_accelerated_files=4000'; \
echo 'opcache.revalidate_freq=2'; \
echo 'opcache.enable_cli=1'; \
} > /etc/php82/conf.d/php-opcache.ini && \
} > /etc/php83/conf.d/php-opcache.ini && \
if [ -z ${GRAV_RELEASE+x} ]; then \
GRAV_RELEASE=$(curl -sX GET "https://api.github.com/repos/getgrav/grav/releases/latest" \
| awk '/tag_name/{print $4;exit}' FS='[""]'); \
Expand Down
3 changes: 2 additions & 1 deletion readme-vars.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ param_ports:

param_usage_include_vols: true
param_volumes:
- { vol_path: "/config", vol_host_path: "/path/to/appdata/config", desc: "Contains all relevant configuration files." }
- { vol_path: "/config", vol_host_path: "/path/to/{{ project_name }}/config", desc: "Persistent config files" }

# application setup block
app_setup_block_enabled: true
Expand All @@ -39,6 +39,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: "06.05.23:", desc: "Add php-ldap for LDAP support." }
- { date: "13.04.23:", desc: "Move ssl.conf include to default.conf." }
Expand Down