From ae28e4540262a04434c8dbad0c4153efc9baabfe Mon Sep 17 00:00:00 2001 From: monkeyco Date: Tue, 21 May 2019 11:03:42 +0200 Subject: [PATCH 1/3] Add update --- entrypoint-custom | 1 + 1 file changed, 1 insertion(+) diff --git a/entrypoint-custom b/entrypoint-custom index 3f64b23..6a83b12 100644 --- a/entrypoint-custom +++ b/entrypoint-custom @@ -6,6 +6,7 @@ if [ "$1" = 'run' ] then #sh /scripts/init.sh + apt-get update #google pagespeed option if [ "$PAGESPEED" = "true" ] From 30540b3c56df923f9c960031c943912fbec4f89c Mon Sep 17 00:00:00 2001 From: monkeyco Date: Tue, 21 May 2019 11:39:45 +0200 Subject: [PATCH 2/3] Add bsdiff --- scripts/before-pecl.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/scripts/before-pecl.sh b/scripts/before-pecl.sh index e93aec8..c8d67b9 100644 --- a/scripts/before-pecl.sh +++ b/scripts/before-pecl.sh @@ -1,5 +1,13 @@ #!/bin/bash +#bsdiff extension +apt-get install bzip2 git -y +git clone https://github.com/monkey-company/phpdiff.git +cd phpdiff +phpize +export LDFLAGS="-lbz2" && ./configure --with-php-config=/php-path/bin/php-config +make && make install + #xdiff library cd /usr/src wget http://www.xmailserver.org/libxdiff-0.22.tar.gz From 2a866c018795e06cbc7b48a626bb7c09efe345be Mon Sep 17 00:00:00 2001 From: monkeyco Date: Tue, 21 May 2019 12:20:39 +0200 Subject: [PATCH 3/3] Bsdiff native --- Dockerfile | 2 +- scripts/before-pecl.sh | 8 -------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/Dockerfile b/Dockerfile index bb8dcbe..16d2f85 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,7 +9,7 @@ ENV DEBIAN_FRONTEND="noninteractive" \ EMAIL="admin@localhost" \ SHFILE="/etc/apache2/file.sh" \ PAGESPEED="true" \ - LIBMOD="re2c" \ + LIBMOD="re2c,bsdiff" \ APAMOD="cache,rewrite,ssl,headers" \ APDMOD="autoindex" \ PHPMOD="bcmath,bz2,intl,gd,mbstring,mysql,zip" \ diff --git a/scripts/before-pecl.sh b/scripts/before-pecl.sh index c8d67b9..e93aec8 100644 --- a/scripts/before-pecl.sh +++ b/scripts/before-pecl.sh @@ -1,13 +1,5 @@ #!/bin/bash -#bsdiff extension -apt-get install bzip2 git -y -git clone https://github.com/monkey-company/phpdiff.git -cd phpdiff -phpize -export LDFLAGS="-lbz2" && ./configure --with-php-config=/php-path/bin/php-config -make && make install - #xdiff library cd /usr/src wget http://www.xmailserver.org/libxdiff-0.22.tar.gz