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

alpine linux 3.20 and php 8.3 #120

Merged
merged 2 commits into from
Nov 3, 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
58 changes: 29 additions & 29 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# syntax=docker/dockerfile:1

ARG FLARUM_VERSION=v1.8.8
ARG ALPINE_VERSION=3.19
ARG ALPINE_VERSION=3.20

FROM crazymax/yasu:latest AS yasu
FROM crazymax/alpine-s6:${ALPINE_VERSION}-2.2.0.3
Expand All @@ -14,34 +14,34 @@ RUN apk --update --no-cache add \
mysql-client \
mariadb-connector-c \
nginx \
php82 \
php82-cli \
php82-ctype \
php82-curl \
php82-dom \
php82-exif \
php82-fileinfo \
php82-fpm \
php82-gd \
php82-gmp \
php82-iconv \
php82-intl \
php82-json \
php82-mbstring \
php82-opcache \
php82-openssl \
php82-pdo \
php82-pdo_mysql \
php82-pecl-uuid \
php82-phar \
php82-session \
php82-simplexml \
php82-sodium \
php82-tokenizer \
php82-xml \
php82-xmlwriter \
php82-zip \
php82-zlib \
php83 \
php83-cli \
php83-ctype \
php83-curl \
php83-dom \
php83-exif \
php83-fileinfo \
php83-fpm \
php83-gd \
php83-gmp \
php83-iconv \
php83-intl \
php83-json \
php83-mbstring \
php83-opcache \
php83-openssl \
php83-pdo \
php83-pdo_mysql \
php83-pecl-uuid \
php83-phar \
php83-session \
php83-simplexml \
php83-sodium \
php83-tokenizer \
php83-xml \
php83-xmlwriter \
php83-zip \
php83-zlib \
shadow \
tar \
tzdata \
Expand Down
2 changes: 1 addition & 1 deletion rootfs/etc/cont-init.d/02-fix-perms.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@ chown -R flarum. \
/tpls \
/var/lib/nginx \
/var/log/nginx \
/var/log/php82 \
/var/log/php83 \
/var/run/nginx \
/var/run/php-fpm
8 changes: 4 additions & 4 deletions rootfs/etc/cont-init.d/03-config.sh
Original file line number Diff line number Diff line change
Expand Up @@ -73,16 +73,16 @@ echo "Setting PHP-FPM configuration..."
sed -e "s/@MEMORY_LIMIT@/$MEMORY_LIMIT/g" \
-e "s/@UPLOAD_MAX_SIZE@/$UPLOAD_MAX_SIZE/g" \
-e "s/@CLEAR_ENV@/$CLEAR_ENV/g" \
/tpls/etc/php82/php-fpm.d/www.conf >/etc/php82/php-fpm.d/www.conf
/tpls/etc/php83/php-fpm.d/www.conf >/etc/php83/php-fpm.d/www.conf

echo "Setting PHP INI configuration..."
sed -i "s|memory_limit.*|memory_limit = ${MEMORY_LIMIT}|g" /etc/php82/php.ini
sed -i "s|;date\.timezone.*|date\.timezone = ${TZ}|g" /etc/php82/php.ini
sed -i "s|memory_limit.*|memory_limit = ${MEMORY_LIMIT}|g" /etc/php83/php.ini
sed -i "s|;date\.timezone.*|date\.timezone = ${TZ}|g" /etc/php83/php.ini

# OpCache
echo "Setting OpCache configuration..."
sed -e "s/@OPCACHE_MEM_SIZE@/$OPCACHE_MEM_SIZE/g" \
/tpls/etc/php82/conf.d/opcache.ini >/etc/php82/conf.d/opcache.ini
/tpls/etc/php83/conf.d/opcache.ini >/etc/php83/conf.d/opcache.ini

# Nginx
echo "Setting Nginx configuration..."
Expand Down
2 changes: 1 addition & 1 deletion rootfs/etc/cont-init.d/04-svc-main.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@ mkdir -p /etc/services.d/php-fpm
cat > /etc/services.d/php-fpm/run <<EOL
#!/usr/bin/execlineb -P
s6-setuidgid ${PUID}:${PGID}
php-fpm82 -F
php-fpm83 -F
EOL
chmod +x /etc/services.d/php-fpm/run