From 53951a1c5b5104a9d2ebc4f06e7c78320da8bc8f Mon Sep 17 00:00:00 2001 From: hyung-hwan Date: Fri, 10 Sep 2021 13:14:21 +0000 Subject: [PATCH] changed the docker files to increase php's max_execution_time to 120 --- codepot/docker/Dockerfile.rocky8 | 5 +++-- codepot/docker/Dockerfile.ubnt2004 | 2 +- codepot/docker/build-rocky8.sh | 4 +++- codepot/docker/build-ubnt2004.sh | 3 ++- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/codepot/docker/Dockerfile.rocky8 b/codepot/docker/Dockerfile.rocky8 index 5a608cf6..4081954b 100644 --- a/codepot/docker/Dockerfile.rocky8 +++ b/codepot/docker/Dockerfile.rocky8 @@ -4,11 +4,12 @@ FROM rockylinux/rockylinux:latest ## epel-release for mod_perl RUN dnf install -y epel-release +# for mysql access, include php-mysqli and perl-DBD-MYSQL RUN dnf install -y \ subversion subversion-perl \ - httpd php php-mysqli php-gd php-pdo \ + httpd php php-gd php-pdo php-ldap \ perl-Digest-SHA perl-Config-Simple \ - perl-DBD-MySQL perl-DBD-SQLite perl-LDAP perl-Mail-Sendmail \ + perl-DBD-SQLite perl-LDAP perl-Mail-Sendmail \ mod_dav_svn mod_perl diffutils sqlite RUN dnf install -y php-devel subversion-devel perl-devel make diff --git a/codepot/docker/Dockerfile.ubnt2004 b/codepot/docker/Dockerfile.ubnt2004 index 7203f923..28a001f4 100644 --- a/codepot/docker/Dockerfile.ubnt2004 +++ b/codepot/docker/Dockerfile.ubnt2004 @@ -3,7 +3,7 @@ FROM ubuntu:20.04 RUN apt update && \ DEBIAN_FRONTEND=noninteractive apt install -y --no-install-recommends \ subversion apache2 \ - php libapache2-mod-php php-gd php-sqlite3 \ + php libapache2-mod-php php-gd php-sqlite3 php-ldap \ libapache2-mod-perl2 libapache2-mod-svn \ libswitch-perl libconfig-simple-perl libdigest-sha-perl \ libdbd-sqlite3-perl libnet-ldap-perl libsvn-perl libmail-sendmail-perl \ diff --git a/codepot/docker/build-rocky8.sh b/codepot/docker/build-rocky8.sh index 17be400d..67c323fd 100755 --- a/codepot/docker/build-rocky8.sh +++ b/codepot/docker/build-rocky8.sh @@ -26,7 +26,9 @@ sed -ri -e 's|Digest::SHA1|Digest::SHA|g' /usr/sbin/codepot-user && \ sed -ri -e 's|Digest::SHA1|Digest::SHA|g' /etc/codepot/perl/Codepot/AccessHandler.pm && \ mkdir -p /run/php-fpm && \ cp -pf /etc/codepot/codepot.httpd /etc/httpd/conf.d/codepot.conf && \ -echo "PerlSwitches -Mlib=/etc/codepot/perl" >> /etc/httpd/conf.d/perl.conf +echo "PerlSwitches -Mlib=/etc/codepot/perl" >> /etc/httpd/conf.d/perl.conf && \ +sed -ri -e 's|^max_execution_time[[:space:]]*=.*$|max_execution_time = 120|g' /etc/php.ini + # mod_perl has dependency on perl-devel which i think is wrong. # so i can't get perl-devel removed. diff --git a/codepot/docker/build-ubnt2004.sh b/codepot/docker/build-ubnt2004.sh index cbad8eb8..98f5f430 100755 --- a/codepot/docker/build-ubnt2004.sh +++ b/codepot/docker/build-ubnt2004.sh @@ -28,7 +28,8 @@ sed -ri -e 's|^database_hostname[[:space:]]*=[[:space:]]*"localhost"$|database_h sed -ri -e 's|Digest::SHA1|Digest::SHA|g' /usr/sbin/codepot-user && \ sed -ri -e 's|Digest::SHA1|Digest::SHA|g' /etc/codepot/perl/Codepot/AccessHandler.pm && \ cp -pf /etc/codepot/codepot.httpd /etc/apache2/conf-enabled/codepot.conf && \ -echo "PerlSwitches -Mlib=/etc/codepot/perl" >> /etc/apache2/conf-enabled/perl.conf +echo "PerlSwitches -Mlib=/etc/codepot/perl" >> /etc/apache2/conf-enabled/perl.conf && \ +sed -ri -e 's|^max_execution_time[[:space:]]*=.*$|max_execution_time = 120|g' /etc/php/*/apache2/php.ini apt remove --purge -y --allow-remove-essential php-dev libsvn-dev make libfdisk1 && \