Fixes

Author: mnapoli

layers/amqp/Dockerfile

@@ -9,8 +9,7 @@ RUN mkdir -p ${AMQP_BUILD_DIR}
 
 # Compile rabbitmq
 WORKDIR ${AMQP_BUILD_DIR}
-# Currently it is not possible to use newer rabbitmq-c version than 0.13.0 because this is
-# last version which supports CMake 3.17 which is latest available version in Amazon Linux 2.
+RUN LD_LIBRARY_PATH= dnf install -y cmake
 RUN curl -Ls -o rabbitmq-c.tar.gz https://github.com/alanxz/rabbitmq-c/archive/refs/tags/v0.13.0.tar.gz
 RUN tar xzf rabbitmq-c.tar.gz
 WORKDIR ${AMQP_BUILD_DIR}/rabbitmq-c-0.13.0
@@ -19,9 +18,9 @@ RUN cmake --build . --target install
 
 # Compile the php amqp extension
 WORKDIR ${AMQP_BUILD_DIR}
-RUN git clone https://github.com/php-amqp/php-amqp
+RUN curl -Ls -o php-amqp.tar.gz https://github.com/php-amqp/php-amqp/archive/refs/tags/v2.1.2.tar.gz && \
+    tar xzf php-amqp.tar.gz && mv php-amqp-2.1.2 php-amqp
 WORKDIR ${AMQP_BUILD_DIR}/php-amqp
-RUN git checkout v2.1.2
 RUN phpize
 RUN ./configure
 RUN make -j $(nproc)

layers/datadog/Dockerfile

@@ -19,6 +19,7 @@ RUN cp "$(php-config --extension-dir)/ddtrace.so" /tmp/ddtrace.so && \
 
 RUN sed -i 's/extension = ddtrace\.so/extension = \/opt\/bref-extra\/ddtrace.so/' /tmp/ext.ini && \
     sed -i 's/extension = datadog-profiling\.so/extension = \/opt\/bref-extra\/datadog-profiling.so/' /tmp/ext.ini && \
+    sed -i '/extension = ddappsec\.so/d' /tmp/ext.ini && \
     sed -i 's/;datadog\.agent_host.*$/datadog\.agent_host = 127.0.0.1/' /tmp/ext.ini && \
     sed -i 's/^.*datadog\.appsec\.enabled.*$/datadog.appsec.enabled = Off/' /tmp/ext.ini && \
     sed -i 's/datadog\.profiling\.enabled = On/datadog.profiling.enabled = 1/' /tmp/ext.ini

layers/h3/Dockerfile

@@ -9,9 +9,10 @@ RUN mkdir -p ${H3_BUILD_DIR}
 
 # Compile h3
 WORKDIR ${H3_BUILD_DIR}
-RUN git clone https://github.com/uber/h3.git && \
-    cd h3 && \
-    git checkout v3.7.2 && \
+RUN LD_LIBRARY_PATH= dnf install -y cmake
+RUN curl -Ls -o h3.tar.gz https://github.com/uber/h3/archive/refs/tags/v3.7.2.tar.gz && \
+    tar xzf h3.tar.gz && \
+    cd h3-3.7.2 && \
     cmake -DBUILD_SHARED_LIBS=ON . && \
     make -j "$(nproc)" && \
     make install

layers/mailparse/Dockerfile

@@ -5,7 +5,9 @@ FROM bref/build-php-$PHP_VERSION:$BREF_VERSION AS ext
 ENV LD_LIBRARY_PATH=/usr/lib:/usr/lib64:$LD_LIBRARY_PATH
 RUN dnf install -y re2c
 
-RUN pecl install mailparse
+RUN curl -Ls https://pecl.php.net/get/mailparse | tar xzC /tmp && \
+    cd /tmp/mailparse-* && \
+    phpize && ./configure && make -j $(nproc) && make install
 RUN cp `php-config --extension-dir`/mailparse.so /tmp/mailparse.so
 RUN echo 'extension=mailparse.so' > /tmp/ext.ini
 

layers/memcached/Dockerfile

@@ -4,6 +4,8 @@ FROM bref/build-php-$PHP_VERSION:$BREF_VERSION AS ext
 
 ENV LIBMEMCACHED_BUILD_DIR=${BUILD_DIR}/libmemcached
 
+RUN LD_LIBRARY_PATH= dnf install -y patch
+
 RUN set -xe; \
     mkdir -p ${LIBMEMCACHED_BUILD_DIR}; \
     # Download and upack the source code

layers/oci8/config.json

@@ -1,7 +1,4 @@
 {
     "php": [
-        "82",
-        "83",
-        "84"
     ]
 }

layers/redis/config.json

@@ -0,0 +1,4 @@
+{
+    "php": [
+    ]
+}

layers/ssh2/Dockerfile

@@ -6,10 +6,12 @@ RUN LD_LIBRARY_PATH=/lib64:/lib dnf install -y libssh2 libssh2-devel
 RUN pecl install ssh2-beta
 RUN cp `php-config --extension-dir`/ssh2.so /tmp/ssh2.so
 RUN echo 'extension=ssh2.so' > /tmp/ext.ini
+RUN php /bref/lib-copy/copy-dependencies.php /tmp/ssh2.so /tmp/extension-libs
 
 # Build the final image with just the files we need
 FROM scratch
 
 # Copy things we installed to the final image
 COPY --from=ext /tmp/ssh2.so /opt/bref/extensions/ssh2.so
 COPY --from=ext /tmp/ext.ini /opt/bref/etc/php/conf.d/ext-ssh2.ini
+COPY --from=ext /tmp/extension-libs /opt/lib

layers/swoole/config.json

@@ -1,6 +1,4 @@
 {
     "php": [
-        "82",
-        "83"
     ]
 }