From 8e361ec2017cf08fc896fd0a28da3b3742cebb09 Mon Sep 17 00:00:00 2001 From: Matthew Gallagher Date: Fri, 12 Sep 2014 01:29:12 -0400 Subject: [PATCH 1/2] Added compile option --with-mysqli in versions with Apache --- 5.3/apache/Dockerfile | 2 +- 5.4/apache/Dockerfile | 2 +- 5.5/apache/Dockerfile | 2 +- 5.6/apache/Dockerfile | 2 +- Dockerfile-apache-insert | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/5.3/apache/Dockerfile b/5.3/apache/Dockerfile index 8d092a9f09..05610cb303 100644 --- a/5.3/apache/Dockerfile +++ b/5.3/apache/Dockerfile @@ -52,7 +52,7 @@ RUN set -x \ && echo "Hello, World!'; ?>" >> /var/www/html/index.php \ && cd /usr/src/php \ && make clean \ - && ./configure --with-apxs2=/usr/local/apache2/bin/apxs --with-mysql \ + && ./configure --with-apxs2=/usr/local/apache2/bin/apxs --with-mysql --with-mysqli \ && make -j"$(nproc)" \ && make install \ && cp php.ini-development /usr/local/lib/php.ini \ diff --git a/5.4/apache/Dockerfile b/5.4/apache/Dockerfile index 9497629e78..e3f2734540 100644 --- a/5.4/apache/Dockerfile +++ b/5.4/apache/Dockerfile @@ -51,7 +51,7 @@ RUN set -x \ && echo "Hello, World!'; ?>" >> /var/www/html/index.php \ && cd /usr/src/php \ && make clean \ - && ./configure --with-apxs2=/usr/local/apache2/bin/apxs --with-mysql \ + && ./configure --with-apxs2=/usr/local/apache2/bin/apxs --with-mysql --with-mysqli \ && make -j"$(nproc)" \ && make install \ && cp php.ini-development /usr/local/lib/php.ini \ diff --git a/5.5/apache/Dockerfile b/5.5/apache/Dockerfile index 2430e73416..32a79ca45e 100644 --- a/5.5/apache/Dockerfile +++ b/5.5/apache/Dockerfile @@ -51,7 +51,7 @@ RUN set -x \ && echo "Hello, World!'; ?>" >> /var/www/html/index.php \ && cd /usr/src/php \ && make clean \ - && ./configure --with-apxs2=/usr/local/apache2/bin/apxs --with-mysql \ + && ./configure --with-apxs2=/usr/local/apache2/bin/apxs --with-mysql --with-mysqli \ && make -j"$(nproc)" \ && make install \ && cp php.ini-development /usr/local/lib/php.ini \ diff --git a/5.6/apache/Dockerfile b/5.6/apache/Dockerfile index e74aaa140e..8287b0b2a4 100644 --- a/5.6/apache/Dockerfile +++ b/5.6/apache/Dockerfile @@ -51,7 +51,7 @@ RUN set -x \ && echo "Hello, World!'; ?>" >> /var/www/html/index.php \ && cd /usr/src/php \ && make clean \ - && ./configure --with-apxs2=/usr/local/apache2/bin/apxs --with-mysql \ + && ./configure --with-apxs2=/usr/local/apache2/bin/apxs --with-mysql --with-mysqli \ && make -j"$(nproc)" \ && make install \ && cp php.ini-development /usr/local/lib/php.ini \ diff --git a/Dockerfile-apache-insert b/Dockerfile-apache-insert index 87f0e17a61..5e3249a8b8 100644 --- a/Dockerfile-apache-insert +++ b/Dockerfile-apache-insert @@ -28,7 +28,7 @@ && echo "Hello, World!'; ?>" >> /var/www/html/index.php \ && cd /usr/src/php \ && make clean \ - && ./configure --with-apxs2=/usr/local/apache2/bin/apxs --with-mysql \ + && ./configure --with-apxs2=/usr/local/apache2/bin/apxs --with-mysql --with-mysqli \ && make -j"$(nproc)" \ && make install \ && cp php.ini-development /usr/local/lib/php.ini \ From 7d61fd53df92f93172ede35a692fd5f645a0252c Mon Sep 17 00:00:00 2001 From: Matthew Gallagher Date: Fri, 12 Sep 2014 17:49:19 -0400 Subject: [PATCH 2/2] Added mysql PDO support to compile flags in versions with Apache --- 5.3/apache/Dockerfile | 2 +- 5.4/apache/Dockerfile | 2 +- 5.5/apache/Dockerfile | 2 +- 5.6/apache/Dockerfile | 2 +- Dockerfile-apache-insert | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/5.3/apache/Dockerfile b/5.3/apache/Dockerfile index 05610cb303..257a88bedf 100644 --- a/5.3/apache/Dockerfile +++ b/5.3/apache/Dockerfile @@ -52,7 +52,7 @@ RUN set -x \ && echo "Hello, World!'; ?>" >> /var/www/html/index.php \ && cd /usr/src/php \ && make clean \ - && ./configure --with-apxs2=/usr/local/apache2/bin/apxs --with-mysql --with-mysqli \ + && ./configure --with-apxs2=/usr/local/apache2/bin/apxs --with-mysql --with-mysqli --with-pdo-mysql \ && make -j"$(nproc)" \ && make install \ && cp php.ini-development /usr/local/lib/php.ini \ diff --git a/5.4/apache/Dockerfile b/5.4/apache/Dockerfile index e3f2734540..c9058b8449 100644 --- a/5.4/apache/Dockerfile +++ b/5.4/apache/Dockerfile @@ -51,7 +51,7 @@ RUN set -x \ && echo "Hello, World!'; ?>" >> /var/www/html/index.php \ && cd /usr/src/php \ && make clean \ - && ./configure --with-apxs2=/usr/local/apache2/bin/apxs --with-mysql --with-mysqli \ + && ./configure --with-apxs2=/usr/local/apache2/bin/apxs --with-mysql --with-mysqli --with-pdo-mysql \ && make -j"$(nproc)" \ && make install \ && cp php.ini-development /usr/local/lib/php.ini \ diff --git a/5.5/apache/Dockerfile b/5.5/apache/Dockerfile index 32a79ca45e..c1f264eacf 100644 --- a/5.5/apache/Dockerfile +++ b/5.5/apache/Dockerfile @@ -51,7 +51,7 @@ RUN set -x \ && echo "Hello, World!'; ?>" >> /var/www/html/index.php \ && cd /usr/src/php \ && make clean \ - && ./configure --with-apxs2=/usr/local/apache2/bin/apxs --with-mysql --with-mysqli \ + && ./configure --with-apxs2=/usr/local/apache2/bin/apxs --with-mysql --with-mysqli --with-pdo-mysql \ && make -j"$(nproc)" \ && make install \ && cp php.ini-development /usr/local/lib/php.ini \ diff --git a/5.6/apache/Dockerfile b/5.6/apache/Dockerfile index 8287b0b2a4..e06c4d828c 100644 --- a/5.6/apache/Dockerfile +++ b/5.6/apache/Dockerfile @@ -51,7 +51,7 @@ RUN set -x \ && echo "Hello, World!'; ?>" >> /var/www/html/index.php \ && cd /usr/src/php \ && make clean \ - && ./configure --with-apxs2=/usr/local/apache2/bin/apxs --with-mysql --with-mysqli \ + && ./configure --with-apxs2=/usr/local/apache2/bin/apxs --with-mysql --with-mysqli --with-pdo-mysql \ && make -j"$(nproc)" \ && make install \ && cp php.ini-development /usr/local/lib/php.ini \ diff --git a/Dockerfile-apache-insert b/Dockerfile-apache-insert index 5e3249a8b8..e40865aea0 100644 --- a/Dockerfile-apache-insert +++ b/Dockerfile-apache-insert @@ -28,7 +28,7 @@ && echo "Hello, World!'; ?>" >> /var/www/html/index.php \ && cd /usr/src/php \ && make clean \ - && ./configure --with-apxs2=/usr/local/apache2/bin/apxs --with-mysql --with-mysqli \ + && ./configure --with-apxs2=/usr/local/apache2/bin/apxs --with-mysql --with-mysqli --with-pdo-mysql \ && make -j"$(nproc)" \ && make install \ && cp php.ini-development /usr/local/lib/php.ini \