From 46e45bfa19f90ee34fdadc48aa2e04037098072e Mon Sep 17 00:00:00 2001
From: xZero707 <xzero@elite7hackers.net>
Date: Mon, 27 Sep 2021 03:29:55 +0200
Subject: [PATCH] Add missing runtime libraries, and fix patch filename/path

---
 Dockerfile                               | 14 +++++++-------
 rootfs/etc/cont-init.d/10-init-wordpress |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index e71e38e..32a9f96 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,18 +9,18 @@ FROM --platform=${TARGETPLATFORM} wordpress:${WP_VERSION}-php${PHP_VERSION}-fpm-
 # Stage 2 - Build 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-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/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/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/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/test",       "/usr/local/lib/php/test/"]
 
 
 # Stage 3 - Final
 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
 
-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"
 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
 
 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
diff --git a/rootfs/etc/cont-init.d/10-init-wordpress b/rootfs/etc/cont-init.d/10-init-wordpress
index 4bed22f..8f1ef7d 100644
--- a/rootfs/etc/cont-init.d/10-init-wordpress
+++ b/rootfs/etc/cont-init.d/10-init-wordpress
@@ -12,7 +12,7 @@ WP_VERSION=$(echo "${WP_VERSION}" | sed --expression='s/.0//g');
 function disableUpdatesPatch() {
   if [ "${DISABLE_WP_UPDATES}" != "false" ]; then
     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
 }