N0rthernL1ghts/wordpress
1
0
Fork 0
mirror of https://github.com/N0rthernL1ghts/wordpress.git synced 2024-11-27 14:15:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add missing runtime libraries, and fix patch filename/path

Browse Source
This commit is contained in:
xZero707 2021-09-27 03:29:55 +02:00
parent c94900d314
commit 46e45bfa19
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Dockerfile
View File

@ -9,18 +9,18 @@ FROM --platform=${TARGETPLATFORM} wordpress:${WP_VERSION}-php${PHP_VERSION}-fpm-
# Stage 2 - Build rootfs # Stage 2 - Build rootfs
FROM scratch AS wordpress-rootfs FROM scratch AS wordpress-rootfs
COPY --from=wordpress /usr/local/etc/php/conf.d /usr/local/etc/php/conf.d/ COPY --from=wordpress ["/usr/local/etc/php/conf.d", "/usr/local/etc/php/conf.d/"]
COPY --from=wordpress /usr/local/etc/php-fpm.d /usr/local/etc/php-fpm.d/ COPY --from=wordpress ["/usr/local/etc/php-fpm.d", "/usr/local/etc/php-fpm.d/"]
COPY --from=wordpress /usr/local/include/php/ext /usr/local/include/php/ext/ COPY --from=wordpress ["/usr/local/include/php/ext", "/usr/local/include/php/ext/"]
COPY --from=wordpress /usr/local/lib/php/extensions /usr/local/lib/php/extensions/ COPY --from=wordpress ["/usr/local/lib/php/extensions", "/usr/local/lib/php/extensions/"]
COPY --from=wordpress /usr/local/lib/php/test /usr/local/lib/php/test/ COPY --from=wordpress ["/usr/local/lib/php/test", "/usr/local/lib/php/test/"]
# Stage 3 - Final # Stage 3 - Final
FROM --platform=${TARGETPLATFORM} nlss/php-nginx:${PHP_VERSION} FROM --platform=${TARGETPLATFORM} nlss/php-nginx:${PHP_VERSION}
# As long as new version doesn't require changes to Dockerfile, we don't need separate files # As long as new version doesn't require changes to Dockerfile, we don't need separate files
ENV APK_RUNTIME_DEPS "zlib-dev libzip-dev libpng-dev icu-dev imagemagick-dev patch" ENV APK_RUNTIME_DEPS "zlib-dev libzip-dev libpng-dev icu-dev imagemagick-dev libjpeg libgomp patch"
ENV APK_WP_CLI_DEPS "bash less mysql-client" ENV APK_WP_CLI_DEPS "bash less mysql-client"
RUN apk add --update --no-cache ${APK_WP_CLI_DEPS} ${APK_RUNTIME_DEPS} RUN apk add --update --no-cache ${APK_WP_CLI_DEPS} ${APK_RUNTIME_DEPS}
@ -45,6 +45,6 @@ ENV ENFORCE_DISABLE_WP_UPDATES true
ENV WP_CLI_DISABLE_AUTO_CHECK_UPDATE true ENV WP_CLI_DISABLE_AUTO_CHECK_UPDATE true
COPY ["wp-config.php", "/var/www/html"] COPY ["wp-config.php", "/var/www/html"]
COPY ["patches/${WP_VERSION}/wp-admin-update-core.patch", "/etc/wp-mods/wp-admin/update-core.php.patch"] COPY ["patches/${WP_VERSION}/wp-admin-update-core.patch", "/etc/wp-mods/"]
EXPOSE 80/TCP EXPOSE 80/TCP

2
rootfs/etc/cont-init.d/10-init-wordpress
View File

@ -12,7 +12,7 @@ WP_VERSION=$(echo "${WP_VERSION}" | sed --expression='s/.0//g');
function disableUpdatesPatch() { function disableUpdatesPatch() {
if [ "${DISABLE_WP_UPDATES}" != "false" ]; then if [ "${DISABLE_WP_UPDATES}" != "false" ]; then
echo "> Disabling WordPress updates..." echo "> Disabling WordPress updates..."
patch /var/www/html/wp-admin/update-core.php </etc/wp-mods/wp-admin/wp-admin-update-core.patch patch /var/www/html/wp-admin/update-core.php </etc/wp-mods/wp-admin-update-core.patch
fi fi
} }