Skip to content

Commit e0b90e7

Browse files
committed
Build for PHP 8.4 and update libraries
1 parent 22ad750 commit e0b90e7

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+114
-71
lines changed

layers/amqp/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,17 @@ RUN mkdir -p ${AMQP_BUILD_DIR}
99

1010
# Compile rabbitmq
1111
WORKDIR ${AMQP_BUILD_DIR}
12-
RUN curl -Ls -o rabbitmq-c.tar.gz https://github.com/alanxz/rabbitmq-c/archive/refs/tags/v0.13.0.tar.gz
12+
RUN curl -Ls -o rabbitmq-c.tar.gz https://github.com/alanxz/rabbitmq-c/archive/refs/tags/v0.15.0.tar.gz
1313
RUN tar xzf rabbitmq-c.tar.gz
14-
WORKDIR ${AMQP_BUILD_DIR}/rabbitmq-c-0.13.0
14+
WORKDIR ${AMQP_BUILD_DIR}/rabbitmq-c-0.15.0
1515
RUN cmake -DCMAKE_INSTALL_PREFIX=${INSTALL_DIR} .
1616
RUN cmake --build . --target install
1717

1818
# Compile the php amqp extension
1919
WORKDIR ${AMQP_BUILD_DIR}
2020
RUN git clone https://github.com/php-amqp/php-amqp
2121
WORKDIR ${AMQP_BUILD_DIR}/php-amqp
22-
RUN git reset --hard 618e06ad2ef867598831cdd3faadba0dd65be917
22+
RUN git checkout v2.1.2
2323
RUN phpize
2424
RUN ./configure
2525
RUN make -j $(nproc)

layers/amqp/config.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
"80",
44
"81",
55
"82",
6-
"83"
6+
"83",
7+
"84"
78
]
89
}

layers/blackfire/config.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
"80",
44
"81",
55
"82",
6-
"83"
6+
"83",
7+
"84"
78
]
89
}

layers/bsdiff/config.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
"80",
44
"81",
55
"82",
6-
"83"
6+
"83",
7+
"84"
78
]
89
}

layers/calendar/config.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
"80",
44
"81",
55
"82",
6-
"83"
6+
"83",
7+
"84"
78
]
89
}

layers/datadog/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ ENV DDTRACE_BUILD_DIR=${BUILD_DIR}/ddtrace
77
RUN set -xe; \
88
mkdir -p ${DDTRACE_BUILD_DIR}; \
99
curl -Ls -o ${DDTRACE_BUILD_DIR}/datadog-setup.php \
10-
https://github.com/DataDog/dd-trace-php/releases/download/0.96.0/datadog-setup.php
10+
https://github.com/DataDog/dd-trace-php/releases/download/1.5.1/datadog-setup.php
1111

1212
WORKDIR ${DDTRACE_BUILD_DIR}
1313

layers/datadog/config.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
"80",
44
"81",
55
"82",
6-
"83"
6+
"83",
7+
"84"
78
]
89
}

layers/decimal/config.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
"80",
44
"81",
55
"82",
6-
"83"
6+
"83",
7+
"84"
78
]
89
}

layers/ds/config.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
"80",
44
"81",
55
"82",
6-
"83"
6+
"83",
7+
"84"
78
]
89
}

layers/elastic-apm/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ FROM bref/build-php-$PHP_VERSION:$BREF_VERSION AS ext
55
RUN \
66
LD_LIBRARY_PATH=/lib64:/lib yum install -y libcurl-devel openssl-devel \
77
&& mkdir /tmp/apm \
8-
&& curl -L https://github.com/elastic/apm-agent-php/archive/refs/tags/v1.8.4.tar.gz | tar -C /tmp/apm -zx --strip-components=1 \
8+
&& curl -L https://github.com/elastic/apm-agent-php/archive/refs/tags/v1.14.1.tar.gz | tar -C /tmp/apm -zx --strip-components=1 \
99
&& cd /tmp/apm/src/ext \
1010
&& phpize \
1111
&& CFLAGS="-std=gnu99" ./configure --enable-elastic_apm \

0 commit comments

Comments
 (0)