Forráskód Böngészése

Standarize config 0's and 1's, comments

Mark Shust 1 éve
szülő
commit
9cd78e3cf9

+ 7 - 2
images/php/8.1/Dockerfile

@@ -84,8 +84,13 @@ RUN version=$(php -r "echo PHP_MAJOR_VERSION.PHP_MINOR_VERSION;") \
     && mv /tmp/blackfire/blackfire-*.so $(php -r "echo ini_get ('extension_dir');")/blackfire.so \
     && rm -rf /tmp/blackfire /tmp/blackfire-probe.tar.gz
 
-RUN cd /usr/lib && git clone https://github.com/NoiseByNorthwest/php-spx.git
-RUN cd /usr/lib/php-spx && phpize && ./configure && make && make install
+RUN cd /usr/lib \
+    && git clone --depth=1 https://github.com/NoiseByNorthwest/php-spx.git \
+    && /usr/lib/php-spx \
+    && phpize \
+    && ./configure \
+    && make \
+    && make install
 
 RUN curl -sS https://getcomposer.org/installer | \
   php -- --install-dir=/usr/local/bin --filename=composer

+ 1 - 1
images/php/8.1/conf/php-fpm.conf

@@ -30,5 +30,5 @@ clear_env = no
 ; Ensure worker stdout and stderr are sent to the main error log.
 catch_workers_output = yes
 
-; This needed to make PHP-SPX work in fpm mode
+; This needed to make PHP-SPX work in fpm mode.
 process.dumpable = yes

+ 1 - 8
images/php/8.1/conf/php.ini

@@ -1,6 +1,6 @@
 memory_limit = 4G
 max_execution_time = 1800
-zlib.output_compression = 0
+zlib.output_compression = 1
 cgi.fix_pathinfo = 0
 date.timezone = UTC
 
@@ -13,10 +13,3 @@ post_max_size = 100M
 max_input_vars = 10000
 
 sendmail_path = "/usr/bin/msmtp -t"
-
-#SPX profiler
-extension = /usr/lib/php-spx/modules/spx.so
-spx.http_enabled = 1
-spx.http_key = "dev"
-spx.http_ip_whitelist = "*"
-spx.data_dir = /var/www/spx_dumps

+ 7 - 2
images/php/8.2/Dockerfile

@@ -84,8 +84,13 @@ RUN version=$(php -r "echo PHP_MAJOR_VERSION.PHP_MINOR_VERSION;") \
     && mv /tmp/blackfire/blackfire-*.so $(php -r "echo ini_get ('extension_dir');")/blackfire.so \
     && rm -rf /tmp/blackfire /tmp/blackfire-probe.tar.gz
 
-RUN cd /usr/lib && git clone https://github.com/NoiseByNorthwest/php-spx.git
-RUN cd /usr/lib/php-spx && phpize && ./configure && make && make install
+RUN cd /usr/lib \
+    && git clone --depth=1 https://github.com/NoiseByNorthwest/php-spx.git \
+    && /usr/lib/php-spx \
+    && phpize \
+    && ./configure \
+    && make \
+    && make install
 
 RUN curl -sS https://getcomposer.org/installer | \
   php -- --install-dir=/usr/local/bin --filename=composer

+ 1 - 1
images/php/8.2/conf/php-fpm.conf

@@ -30,5 +30,5 @@ clear_env = no
 ; Ensure worker stdout and stderr are sent to the main error log.
 catch_workers_output = yes
 
-; This needed to make PHP-SPX work in fpm mode
+; This needed to make PHP-SPX work in fpm mode.
 process.dumpable = yes

+ 1 - 8
images/php/8.2/conf/php.ini

@@ -1,6 +1,6 @@
 memory_limit = 4G
 max_execution_time = 1800
-zlib.output_compression = 0
+zlib.output_compression = 1
 cgi.fix_pathinfo = 0
 date.timezone = UTC
 
@@ -13,10 +13,3 @@ post_max_size = 100M
 max_input_vars = 10000
 
 sendmail_path = "/usr/bin/msmtp -t"
-
-#SPX profiler
-extension = /usr/lib/php-spx/modules/spx.so
-spx.http_enabled = 1
-spx.http_key = "dev"
-spx.http_ip_whitelist = "*"
-spx.data_dir = /var/www/spx_dumps