ソースを参照

Fix & simplify checkoout of php-spx repo, peg to specific version to avoid updates to the project breaking the build

Mark Shust 1 年間 前
コミット
ab37bf649c
2 ファイル変更4 行追加6 行削除
  1. 2 3
      images/php/8.1/Dockerfile
  2. 2 3
      images/php/8.2/Dockerfile

+ 2 - 3
images/php/8.1/Dockerfile

@@ -84,9 +84,8 @@ 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 --depth=1 https://github.com/NoiseByNorthwest/php-spx.git \
-    && /usr/lib/php-spx \
+RUN git clone --branch v0.4.15 --depth=1 https://github.com/NoiseByNorthwest/php-spx.git /usr/lib/php-spx \
+    && cd /usr/lib/php-spx \
     && phpize \
     && ./configure \
     && make \

+ 2 - 3
images/php/8.2/Dockerfile

@@ -84,9 +84,8 @@ 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 --depth=1 https://github.com/NoiseByNorthwest/php-spx.git \
-    && /usr/lib/php-spx \
+RUN git clone --branch v0.4.15 --depth=1 https://github.com/NoiseByNorthwest/php-spx.git /usr/lib/php-spx \
+    && cd /usr/lib/php-spx \
     && phpize \
     && ./configure \
     && make \