Skip to content
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
40 changes: 20 additions & 20 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ ARG DOKUWIKI_VERSION="2022-07-31a"
ARG DOKUWIKI_MD5="4459ea99e3a4ce2b767482f505724dcc"

FROM crazymax/yasu:latest AS yasu
FROM crazymax/alpine-s6:3.16-2.2.0.3
FROM crazymax/alpine-s6:3.17-2.2.0.3

COPY --from=yasu / /
RUN apk --update --no-cache add \
Expand All @@ -11,25 +11,25 @@ RUN apk --update --no-cache add \
inotify-tools \
libgd \
nginx \
php8 \
php8-cli \
php8-ctype \
php8-curl \
php8-fpm \
php8-gd \
php8-json \
php8-ldap \
php8-mbstring \
php8-openssl \
php8-pdo \
php8-pdo_sqlite \
php8-pecl-imagick \
php8-session \
php8-simplexml \
php8-sqlite3 \
php8-xml \
php8-zip \
php8-zlib \
php81 \
php81-cli \
php81-ctype \
php81-curl \
php81-fpm \
php81-gd \
php81-json \
php81-ldap \
php81-mbstring \
php81-openssl \
php81-pdo \
php81-pdo_sqlite \
php81-pecl-imagick \
php81-session \
php81-simplexml \
php81-sqlite3 \
php81-xml \
php81-zip \
php81-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 @@ -11,7 +11,7 @@ chown -R dokuwiki. \
/tpls \
/var/lib/nginx \
/var/log/nginx \
/var/log/php8 \
/var/log/php81 \
/var/run/nginx \
/var/run/php-fpm \
/var/www/bin \
Expand Down
10 changes: 5 additions & 5 deletions rootfs/etc/cont-init.d/03-config.sh
Original file line number Diff line number Diff line change
Expand Up @@ -26,17 +26,17 @@ 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/php8/php-fpm.d/www.conf > /etc/php8/php-fpm.d/www.conf
/tpls/etc/php81/php-fpm.d/www.conf > /etc/php81/php-fpm.d/www.conf

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

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

# Nginx
echo "Setting Nginx configuration..."
Expand Down
2 changes: 1 addition & 1 deletion rootfs/etc/cont-init.d/04-create-services.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ cat > /etc/services.d/php-fpm/run <<EOL
#!/usr/bin/execlineb -P
with-contenv
s6-setuidgid ${PUID}:${PGID}
php-fpm8 -F
php-fpm81 -F
EOL
chmod +x /etc/services.d/php-fpm/run

Expand Down