Skip to content

Commit c167cea

Browse files
mnapolimnapoli
authored
Merge pull request #74 from GrahamCampbell/openssl-3
2 parents 6d7ad04 + 3028387 commit c167cea

File tree

4 files changed

+32
-30
lines changed

4 files changed

+32
-30
lines changed

‎php-80/Dockerfile‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -83,11 +83,11 @@ ENV CA_BUNDLE_SOURCE="https://curl.se/ca/cacert.pem"
8383
ENV CA_BUNDLE="${INSTALL_DIR}/bref/ssl/cert.pem"
8484
RUN set -xe; \
8585
mkdir -p ${OPENSSL_BUILD_DIR}; \
86-
curl -Ls https://github.com/openssl/openssl/archive/OpenSSL_${VERSION_OPENSSL//./_}.tar.gz \
86+
curl -Ls https://github.com/openssl/openssl/archive/OpenSSL_${VERSION_OPENSSL//./_}.tar.gz \
8787
| tar xzC ${OPENSSL_BUILD_DIR} --strip-components=1
8888
WORKDIR ${OPENSSL_BUILD_DIR}/
8989
RUN CFLAGS="" \
90-
CPPFLAGS="-I${INSTALL_DIR}/include -I/usr/include" \
90+
CPPFLAGS="-I${INSTALL_DIR}/include -I/usr/include" \
9191
LDFLAGS="-L${INSTALL_DIR}/lib64 -L${INSTALL_DIR}/lib" \
9292
./config \
9393
--prefix=${INSTALL_DIR} \
@@ -121,7 +121,7 @@ RUN set -xe; \
121121
| tar xzC ${LIBSSH2_BUILD_DIR} --strip-components=1
122122
WORKDIR ${LIBSSH2_BUILD_DIR}/bin/
123123
RUN CFLAGS="" \
124-
CPPFLAGS="-I${INSTALL_DIR}/include -I/usr/include" \
124+
CPPFLAGS="-I${INSTALL_DIR}/include -I/usr/include" \
125125
LDFLAGS="-L${INSTALL_DIR}/lib64 -L${INSTALL_DIR}/lib" \
126126
cmake .. \
127127
# Build as a shared library (.so) instead of a static one
@@ -153,7 +153,7 @@ RUN set -xe; \
153153
| tar xzC ${NGHTTP2_BUILD_DIR} --strip-components=1
154154
WORKDIR ${NGHTTP2_BUILD_DIR}/
155155
RUN CFLAGS="" \
156-
CPPFLAGS="-I${INSTALL_DIR}/include -I/usr/include" \
156+
CPPFLAGS="-I${INSTALL_DIR}/include -I/usr/include" \
157157
LDFLAGS="-L${INSTALL_DIR}/lib64 -L${INSTALL_DIR}/lib" \
158158
./configure \
159159
--enable-lib-only \
@@ -179,7 +179,7 @@ RUN set -xe; \
179179
WORKDIR ${CURL_BUILD_DIR}/
180180
RUN ./buildconf \
181181
&& CFLAGS="" \
182-
CPPFLAGS="-I${INSTALL_DIR}/include -I/usr/include" \
182+
CPPFLAGS="-I${INSTALL_DIR}/include -I/usr/include" \
183183
LDFLAGS="-L${INSTALL_DIR}/lib64 -L${INSTALL_DIR}/lib" \
184184
./configure \
185185
--prefix=${INSTALL_DIR} \
@@ -220,7 +220,7 @@ RUN set -xe; \
220220
| tar xJC ${XML2_BUILD_DIR} --strip-components=1
221221
WORKDIR ${XML2_BUILD_DIR}/
222222
RUN CFLAGS="" \
223-
CPPFLAGS="-I${INSTALL_DIR}/include -I/usr/include" \
223+
CPPFLAGS="-I${INSTALL_DIR}/include -I/usr/include" \
224224
LDFLAGS="-L${INSTALL_DIR}/lib64 -L${INSTALL_DIR}/lib" \
225225
./configure \
226226
--prefix=${INSTALL_DIR} \
@@ -250,7 +250,7 @@ RUN set -xe; \
250250
| tar xzC ${ZIP_BUILD_DIR} --strip-components=1
251251
WORKDIR ${ZIP_BUILD_DIR}/bin/
252252
RUN CFLAGS="" \
253-
CPPFLAGS="-I${INSTALL_DIR}/include -I/usr/include" \
253+
CPPFLAGS="-I${INSTALL_DIR}/include -I/usr/include" \
254254
LDFLAGS="-L${INSTALL_DIR}/lib64 -L${INSTALL_DIR}/lib" \
255255
cmake .. \
256256
-DCMAKE_INSTALL_PREFIX=${INSTALL_DIR} \
@@ -271,7 +271,7 @@ RUN set -xe; \
271271
| tar xzC ${LIBSODIUM_BUILD_DIR} --strip-components=1
272272
WORKDIR ${LIBSODIUM_BUILD_DIR}/
273273
RUN CFLAGS="" \
274-
CPPFLAGS="-I${INSTALL_DIR}/include -I/usr/include" \
274+
CPPFLAGS="-I${INSTALL_DIR}/include -I/usr/include" \
275275
LDFLAGS="-L${INSTALL_DIR}/lib64 -L${INSTALL_DIR}/lib" \
276276
./autogen.sh \
277277
&& ./configure --prefix=${INSTALL_DIR}
@@ -293,7 +293,7 @@ RUN set -xe; \
293293
| tar xzC ${POSTGRES_BUILD_DIR} --strip-components=1
294294
WORKDIR ${POSTGRES_BUILD_DIR}/
295295
RUN CFLAGS="" \
296-
CPPFLAGS="-I${INSTALL_DIR}/include -I/usr/include" \
296+
CPPFLAGS="-I${INSTALL_DIR}/include -I/usr/include" \
297297
LDFLAGS="-L${INSTALL_DIR}/lib64 -L${INSTALL_DIR}/lib" \
298298
./configure --prefix=${INSTALL_DIR} --with-openssl --without-readline
299299
RUN cd ${POSTGRES_BUILD_DIR}/src/interfaces/libpq && make && make install

‎php-81/Dockerfile‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -77,17 +77,18 @@ RUN mkdir -p ${BUILD_DIR} \
7777
# Needed by:
7878
# - curl
7979
# - php
80-
ENV VERSION_OPENSSL=1.1.1t
80+
RUN yum install -y perl-IPC-Cmd
81+
ENV VERSION_OPENSSL=3.0.8
8182
ENV OPENSSL_BUILD_DIR=${BUILD_DIR}/openssl
8283
ENV CA_BUNDLE_SOURCE="https://curl.se/ca/cacert.pem"
8384
ENV CA_BUNDLE="${INSTALL_DIR}/bref/ssl/cert.pem"
8485
RUN set -xe; \
8586
mkdir -p ${OPENSSL_BUILD_DIR}; \
86-
curl -Ls https://github.com/openssl/openssl/archive/OpenSSL_${VERSION_OPENSSL//./_}.tar.gz \
87+
curl -Ls https://github.com/openssl/openssl/releases/download/openssl-${VERSION_OPENSSL}/openssl-${VERSION_OPENSSL}.tar.gz \
8788
| tar xzC ${OPENSSL_BUILD_DIR} --strip-components=1
8889
WORKDIR ${OPENSSL_BUILD_DIR}/
8990
RUN CFLAGS="" \
90-
CPPFLAGS="-I${INSTALL_DIR}/include -I/usr/include" \
91+
CPPFLAGS="-I${INSTALL_DIR}/include -I/usr/include" \
9192
LDFLAGS="-L${INSTALL_DIR}/lib64 -L${INSTALL_DIR}/lib" \
9293
./config \
9394
--prefix=${INSTALL_DIR} \
@@ -121,7 +122,7 @@ RUN set -xe; \
121122
| tar xzC ${LIBSSH2_BUILD_DIR} --strip-components=1
122123
WORKDIR ${LIBSSH2_BUILD_DIR}/bin/
123124
RUN CFLAGS="" \
124-
CPPFLAGS="-I${INSTALL_DIR}/include -I/usr/include" \
125+
CPPFLAGS="-I${INSTALL_DIR}/include -I/usr/include" \
125126
LDFLAGS="-L${INSTALL_DIR}/lib64 -L${INSTALL_DIR}/lib" \
126127
cmake .. \
127128
# Build as a shared library (.so) instead of a static one
@@ -153,7 +154,7 @@ RUN set -xe; \
153154
| tar xzC ${NGHTTP2_BUILD_DIR} --strip-components=1
154155
WORKDIR ${NGHTTP2_BUILD_DIR}/
155156
RUN CFLAGS="" \
156-
CPPFLAGS="-I${INSTALL_DIR}/include -I/usr/include" \
157+
CPPFLAGS="-I${INSTALL_DIR}/include -I/usr/include" \
157158
LDFLAGS="-L${INSTALL_DIR}/lib64 -L${INSTALL_DIR}/lib" \
158159
./configure \
159160
--enable-lib-only \
@@ -179,7 +180,7 @@ RUN set -xe; \
179180
WORKDIR ${CURL_BUILD_DIR}/
180181
RUN ./buildconf \
181182
&& CFLAGS="" \
182-
CPPFLAGS="-I${INSTALL_DIR}/include -I/usr/include" \
183+
CPPFLAGS="-I${INSTALL_DIR}/include -I/usr/include" \
183184
LDFLAGS="-L${INSTALL_DIR}/lib64 -L${INSTALL_DIR}/lib" \
184185
./configure \
185186
--prefix=${INSTALL_DIR} \
@@ -220,7 +221,7 @@ RUN set -xe; \
220221
| tar xJC ${XML2_BUILD_DIR} --strip-components=1
221222
WORKDIR ${XML2_BUILD_DIR}/
222223
RUN CFLAGS="" \
223-
CPPFLAGS="-I${INSTALL_DIR}/include -I/usr/include" \
224+
CPPFLAGS="-I${INSTALL_DIR}/include -I/usr/include" \
224225
LDFLAGS="-L${INSTALL_DIR}/lib64 -L${INSTALL_DIR}/lib" \
225226
./configure \
226227
--prefix=${INSTALL_DIR} \
@@ -250,7 +251,7 @@ RUN set -xe; \
250251
| tar xzC ${ZIP_BUILD_DIR} --strip-components=1
251252
WORKDIR ${ZIP_BUILD_DIR}/bin/
252253
RUN CFLAGS="" \
253-
CPPFLAGS="-I${INSTALL_DIR}/include -I/usr/include" \
254+
CPPFLAGS="-I${INSTALL_DIR}/include -I/usr/include" \
254255
LDFLAGS="-L${INSTALL_DIR}/lib64 -L${INSTALL_DIR}/lib" \
255256
cmake .. \
256257
-DCMAKE_INSTALL_PREFIX=${INSTALL_DIR} \
@@ -271,7 +272,7 @@ RUN set -xe; \
271272
| tar xzC ${LIBSODIUM_BUILD_DIR} --strip-components=1
272273
WORKDIR ${LIBSODIUM_BUILD_DIR}/
273274
RUN CFLAGS="" \
274-
CPPFLAGS="-I${INSTALL_DIR}/include -I/usr/include" \
275+
CPPFLAGS="-I${INSTALL_DIR}/include -I/usr/include" \
275276
LDFLAGS="-L${INSTALL_DIR}/lib64 -L${INSTALL_DIR}/lib" \
276277
./autogen.sh \
277278
&& ./configure --prefix=${INSTALL_DIR}
@@ -293,7 +294,7 @@ RUN set -xe; \
293294
| tar xzC ${POSTGRES_BUILD_DIR} --strip-components=1
294295
WORKDIR ${POSTGRES_BUILD_DIR}/
295296
RUN CFLAGS="" \
296-
CPPFLAGS="-I${INSTALL_DIR}/include -I/usr/include" \
297+
CPPFLAGS="-I${INSTALL_DIR}/include -I/usr/include" \
297298
LDFLAGS="-L${INSTALL_DIR}/lib64 -L${INSTALL_DIR}/lib" \
298299
./configure --prefix=${INSTALL_DIR} --with-openssl --without-readline
299300
RUN cd ${POSTGRES_BUILD_DIR}/src/interfaces/libpq && make && make install

‎php-82/Dockerfile‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -77,17 +77,18 @@ RUN mkdir -p ${BUILD_DIR} \
7777
# Needed by:
7878
# - curl
7979
# - php
80-
ENV VERSION_OPENSSL=1.1.1t
80+
RUN yum install -y perl-IPC-Cmd
81+
ENV VERSION_OPENSSL=3.0.8
8182
ENV OPENSSL_BUILD_DIR=${BUILD_DIR}/openssl
8283
ENV CA_BUNDLE_SOURCE="https://curl.se/ca/cacert.pem"
8384
ENV CA_BUNDLE="${INSTALL_DIR}/bref/ssl/cert.pem"
8485
RUN set -xe; \
8586
mkdir -p ${OPENSSL_BUILD_DIR}; \
86-
curl -Ls https://github.com/openssl/openssl/archive/OpenSSL_${VERSION_OPENSSL//./_}.tar.gz \
87+
curl -Ls https://github.com/openssl/openssl/releases/download/openssl-${VERSION_OPENSSL}/openssl-${VERSION_OPENSSL}.tar.gz \
8788
| tar xzC ${OPENSSL_BUILD_DIR} --strip-components=1
8889
WORKDIR ${OPENSSL_BUILD_DIR}/
8990
RUN CFLAGS="" \
90-
CPPFLAGS="-I${INSTALL_DIR}/include -I/usr/include" \
91+
CPPFLAGS="-I${INSTALL_DIR}/include -I/usr/include" \
9192
LDFLAGS="-L${INSTALL_DIR}/lib64 -L${INSTALL_DIR}/lib" \
9293
./config \
9394
--prefix=${INSTALL_DIR} \
@@ -121,7 +122,7 @@ RUN set -xe; \
121122
| tar xzC ${LIBSSH2_BUILD_DIR} --strip-components=1
122123
WORKDIR ${LIBSSH2_BUILD_DIR}/bin/
123124
RUN CFLAGS="" \
124-
CPPFLAGS="-I${INSTALL_DIR}/include -I/usr/include" \
125+
CPPFLAGS="-I${INSTALL_DIR}/include -I/usr/include" \
125126
LDFLAGS="-L${INSTALL_DIR}/lib64 -L${INSTALL_DIR}/lib" \
126127
cmake .. \
127128
# Build as a shared library (.so) instead of a static one
@@ -153,7 +154,7 @@ RUN set -xe; \
153154
| tar xzC ${NGHTTP2_BUILD_DIR} --strip-components=1
154155
WORKDIR ${NGHTTP2_BUILD_DIR}/
155156
RUN CFLAGS="" \
156-
CPPFLAGS="-I${INSTALL_DIR}/include -I/usr/include" \
157+
CPPFLAGS="-I${INSTALL_DIR}/include -I/usr/include" \
157158
LDFLAGS="-L${INSTALL_DIR}/lib64 -L${INSTALL_DIR}/lib" \
158159
./configure \
159160
--enable-lib-only \
@@ -179,7 +180,7 @@ RUN set -xe; \
179180
WORKDIR ${CURL_BUILD_DIR}/
180181
RUN ./buildconf \
181182
&& CFLAGS="" \
182-
CPPFLAGS="-I${INSTALL_DIR}/include -I/usr/include" \
183+
CPPFLAGS="-I${INSTALL_DIR}/include -I/usr/include" \
183184
LDFLAGS="-L${INSTALL_DIR}/lib64 -L${INSTALL_DIR}/lib" \
184185
./configure \
185186
--prefix=${INSTALL_DIR} \
@@ -220,7 +221,7 @@ RUN set -xe; \
220221
| tar xJC ${XML2_BUILD_DIR} --strip-components=1
221222
WORKDIR ${XML2_BUILD_DIR}/
222223
RUN CFLAGS="" \
223-
CPPFLAGS="-I${INSTALL_DIR}/include -I/usr/include" \
224+
CPPFLAGS="-I${INSTALL_DIR}/include -I/usr/include" \
224225
LDFLAGS="-L${INSTALL_DIR}/lib64 -L${INSTALL_DIR}/lib" \
225226
./configure \
226227
--prefix=${INSTALL_DIR} \
@@ -250,7 +251,7 @@ RUN set -xe; \
250251
| tar xzC ${ZIP_BUILD_DIR} --strip-components=1
251252
WORKDIR ${ZIP_BUILD_DIR}/bin/
252253
RUN CFLAGS="" \
253-
CPPFLAGS="-I${INSTALL_DIR}/include -I/usr/include" \
254+
CPPFLAGS="-I${INSTALL_DIR}/include -I/usr/include" \
254255
LDFLAGS="-L${INSTALL_DIR}/lib64 -L${INSTALL_DIR}/lib" \
255256
cmake .. \
256257
-DCMAKE_INSTALL_PREFIX=${INSTALL_DIR} \
@@ -271,7 +272,7 @@ RUN set -xe; \
271272
| tar xzC ${LIBSODIUM_BUILD_DIR} --strip-components=1
272273
WORKDIR ${LIBSODIUM_BUILD_DIR}/
273274
RUN CFLAGS="" \
274-
CPPFLAGS="-I${INSTALL_DIR}/include -I/usr/include" \
275+
CPPFLAGS="-I${INSTALL_DIR}/include -I/usr/include" \
275276
LDFLAGS="-L${INSTALL_DIR}/lib64 -L${INSTALL_DIR}/lib" \
276277
./autogen.sh \
277278
&& ./configure --prefix=${INSTALL_DIR}
@@ -293,7 +294,7 @@ RUN set -xe; \
293294
| tar xzC ${POSTGRES_BUILD_DIR} --strip-components=1
294295
WORKDIR ${POSTGRES_BUILD_DIR}/
295296
RUN CFLAGS="" \
296-
CPPFLAGS="-I${INSTALL_DIR}/include -I/usr/include" \
297+
CPPFLAGS="-I${INSTALL_DIR}/include -I/usr/include" \
297298
LDFLAGS="-L${INSTALL_DIR}/lib64 -L${INSTALL_DIR}/lib" \
298299
./configure --prefix=${INSTALL_DIR} --with-openssl --without-readline
299300
RUN cd ${POSTGRES_BUILD_DIR}/src/interfaces/libpq && make && make install

‎tests/test_2_extensions.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@
8181
// https://github.com/brefphp/aws-lambda-layers/issues/42
8282
'curl-http2' => defined('CURL_HTTP_VERSION_2'),
8383
// Make sure we are not using the default AL2 OpenSSL version (7.79)
84-
'curl-openssl' => str_starts_with(curl_version()['ssl_version'], 'OpenSSL/1.1.1'),
84+
'curl-openssl' => str_starts_with(curl_version()['ssl_version'], 'OpenSSL/1.1.1') || str_starts_with(curl_version()['ssl_version'], 'OpenSSL/3.0'),
8585
// Check that the default certificate file exists
8686
// https://github.com/brefphp/aws-lambda-layers/issues/53
8787
'curl-openssl-certificates' => file_exists(openssl_get_cert_locations()['default_cert_file']),

0 commit comments

Comments
 (0)