From f98abbfb2e59f5432ee6bf786ec90748e304a60a Mon Sep 17 00:00:00 2001
From: xZero707 <xzero@elite7hackers.net>
Date: Tue, 9 Feb 2021 20:42:24 +0100
Subject: [PATCH] Optimize build process and other changes

- Optimize build process performance

- Make sure 'patch' package is installed

- Declare wp-cli data dir as volume

- Disable wp-cli automatic update check
---
 Dockerfile | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index f711b4b..f30d4f7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -15,7 +15,7 @@ RUN    mkdir -p usr/local/bin \
 ################################################# APP ##################################################################
 FROM nlss/php-nginx
 ARG WP_VERSION
-ENV APK_DEPS        "zlib-dev libzip-dev libpng-dev icu-dev imagemagick-dev"
+ENV APK_DEPS        "zlib-dev libzip-dev libpng-dev icu-dev imagemagick-dev patch"
 ENV APK_BUILD_DEPS  "curl-dev autoconf alpine-sdk"
 ENV APK_WP_CLI_DEPS "bash less mysql-client"
 
@@ -33,22 +33,25 @@ RUN apk add --update --no-cache ${APK_WP_CLI_DEPS} ${APK_DEPS} ${APK_BUILD_DEPS}
     && apk del ${APK_BUILD_DEPS} \
     && rm /tmp/* -rf
 
-ADD rootfs /
-COPY ["wp-config.php", "/var/www/html"]
 COPY --from=wordpress-builder    /tmp/build/rootfs /
 COPY --from=wordpress:cli-php7.4 /usr/local/bin/wp /usr/local/bin/wp-cli
 
+
 ENV WP_VERSION            ${WP_VERSION}
 ENV WP_LOCALE             en_US
 ENV CRON_ENABLED          true
 ENV VIRTUAL_HOST          your-domain.com
 
+ADD rootfs /
 RUN echo "* * * * * /usr/local/bin/php /var/www/${WEB_ROOT}/wp-cron.php" >> /etc/crontabs/www-data \
     && chmod a+x /usr/local/bin/wp
 
-VOLUME ["/var/www/${WEB_ROOT}", "/var/www/${WEB_ROOT}/wp-content"]
+VOLUME ["/root/.wp-cli", "/var/www/${WEB_ROOT}", "/var/www/${WEB_ROOT}/wp-content"]
 
 ENV S6_BEHAVIOUR_IF_STAGE2_FAILS 2
 ENV ENFORCE_DISABLE_WP_UPDATES   true
+ENV WP_CLI_DISABLE_AUTO_CHECK_UPDATE true
+
+COPY ["wp-config.php", "/var/www/html"]
 
 EXPOSE 80/TCP