Merge pull request #7 from mattva01/master

yosifkit · yosifkit · commit 21df8a5f42e7 · 2014-09-15T10:19:41.000-06:00
Added compile option --with-mysqli in versions with Apache
diff --git a/5.3/apache/Dockerfile b/5.3/apache/Dockerfile
@@ -52,7 +52,7 @@ RUN set -x \
 	&& echo "<html><head></head><body><?php echo '<h1>Hello, World!</h1>'; ?></body></html>" >> /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 --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
@@ -51,7 +51,7 @@ RUN set -x \
 	&& echo "<html><head></head><body><?php echo '<h1>Hello, World!</h1>'; ?></body></html>" >> /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 --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
@@ -51,7 +51,7 @@ RUN set -x \
 	&& echo "<html><head></head><body><?php echo '<h1>Hello, World!</h1>'; ?></body></html>" >> /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 --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
@@ -51,7 +51,7 @@ RUN set -x \
 	&& echo "<html><head></head><body><?php echo '<h1>Hello, World!</h1>'; ?></body></html>" >> /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 --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
@@ -28,7 +28,7 @@
 	&& echo "<html><head></head><body><?php echo '<h1>Hello, World!</h1>'; ?></body></html>" >> /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 --with-pdo-mysql \
 	&& make -j"$(nproc)" \
 	&& make install \
 	&& cp php.ini-development /usr/local/lib/php.ini \
