Skip to content

Commit

Permalink
Alpine Linux 3.19 and PHP 8.2
Browse files Browse the repository at this point in the history
  • Loading branch information
crazy-max committed Dec 30, 2023
1 parent fd84623 commit 2cefff5
Show file tree
Hide file tree
Showing 6 changed files with 35 additions and 35 deletions.
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.3
ARG ALPINE_VERSION=3.18
ARG ALPINE_VERSION=3.19

FROM crazymax/yasu:latest AS yasu
FROM crazymax/alpine-s6:${ALPINE_VERSION}-2.2.0.3
Expand All @@ -13,34 +13,34 @@ RUN apk --update --no-cache add \
libgd \
mysql-client \
nginx \
php81 \
php81-cli \
php81-ctype \
php81-curl \
php81-dom \
php81-exif \
php81-fileinfo \
php81-fpm \
php81-gd \
php81-gmp \
php81-iconv \
php81-intl \
php81-json \
php81-mbstring \
php81-opcache \
php81-openssl \
php81-pdo \
php81-pdo_mysql \
php81-pecl-uuid \
php81-phar \
php81-session \
php81-simplexml \
php81-sodium \
php81-tokenizer \
php81-xml \
php81-xmlwriter \
php81-zip \
php81-zlib \
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 \
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/php81 \
/var/log/php82 \
/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/php81/php-fpm.d/www.conf >/etc/php81/php-fpm.d/www.conf
/tpls/etc/php82/php-fpm.d/www.conf >/etc/php82/php-fpm.d/www.conf

echo "Setting PHP INI configuration..."
sed -i "s|memory_limit.*|memory_limit = ${MEMORY_LIMIT}|g" /etc/php81/php.ini
sed -i "s|;date\.timezone.*|date\.timezone = ${TZ}|g" /etc/php81/php.ini
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

# OpCache
echo "Setting OpCache configuration..."
sed -e "s/@OPCACHE_MEM_SIZE@/$OPCACHE_MEM_SIZE/g" \
/tpls/etc/php81/conf.d/opcache.ini >/etc/php81/conf.d/opcache.ini
/tpls/etc/php82/conf.d/opcache.ini >/etc/php82/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-fpm81 -F
php-fpm82 -F
EOL
chmod +x /etc/services.d/php-fpm/run
File renamed without changes.
File renamed without changes.

0 comments on commit 2cefff5

Please sign in to comment.