Merge pull request #64 from brefphp/add-test

brefphp · Mar 15, 2023 · fe9776d · fe9776d
2 parents 72bb6f0 + f79f533
commit fe9776d
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 15 deletions.
diff --git a/php-80/Dockerfile b/php-80/Dockerfile
@@ -80,7 +80,7 @@ RUN mkdir -p ${BUILD_DIR}  \
 ENV VERSION_OPENSSL=1.1.1t
 ENV OPENSSL_BUILD_DIR=${BUILD_DIR}/openssl
 ENV CA_BUNDLE_SOURCE="https://curl.se/ca/cacert.pem"
-ENV CA_BUNDLE="${INSTALL_DIR}/ssl/cert.pem"
+ENV CA_BUNDLE="${INSTALL_DIR}/bref/ssl/cert.pem"
 RUN set -xe; \
     mkdir -p ${OPENSSL_BUILD_DIR}; \
     curl -Ls  https://github.com/openssl/openssl/archive/OpenSSL_${VERSION_OPENSSL//./_}.tar.gz \
@@ -91,7 +91,7 @@ RUN CFLAGS="" \
     LDFLAGS="-L${INSTALL_DIR}/lib64 -L${INSTALL_DIR}/lib" \
     ./config \
         --prefix=${INSTALL_DIR} \
-        --openssldir=${INSTALL_DIR}/ssl \
+        --openssldir=${INSTALL_DIR}/bref/ssl \
         --release \
         no-tests \
         shared \
@@ -102,7 +102,7 @@ RUN CFLAGS="" \
 # https://stackoverflow.com/questions/28639207/why-cant-i-compile-openssl-with-multiple-threads-make-j3
 # Run `make install_sw install_ssldirs` instead of `make install` to skip installing man pages https://github.com/openssl/openssl/issues/8170
 RUN make -j1 install_sw install_ssldirs
-RUN curl -Lk -o ${CA_BUNDLE} ${CA_BUNDLE_SOURCE}
+RUN mkdir -p ${INSTALL_DIR}/bref/ssl && curl -Lk -o ${CA_BUNDLE} ${CA_BUNDLE_SOURCE}
 
 
 ###############################################################################
@@ -418,7 +418,7 @@ RUN pecl install APCu
 RUN mkdir -p /bref-layer/bin \
 &&  mkdir -p /bref-layer/lib \
 &&  mkdir -p /bref-layer/bref/extensions \
-&&  mkdir -p /bref-layer/ssl
+&&  mkdir -p /bref-layer/bref/ssl
 
 # Copy the PHP binary
 RUN cp ${INSTALL_DIR}/bin/php /bref-layer/bin/php && chmod +x /bref-layer/bin/php
@@ -439,7 +439,7 @@ RUN php /bref/lib-copy/copy-dependencies.php /bref-layer/bref/extensions/pdo_mys
 RUN php /bref/lib-copy/copy-dependencies.php /bref-layer/bref/extensions/pdo_pgsql.so /bref-layer/lib
 
 # Copy the OpenSSL certificates file
-RUN cp ${CA_BUNDLE} /bref-layer/ssl/cert.pem
+RUN cp ${CA_BUNDLE} /bref-layer/bref/ssl/cert.pem
 
 
 # ---------------------------------------------------------------

diff --git a/php-81/Dockerfile b/php-81/Dockerfile
@@ -80,7 +80,7 @@ RUN mkdir -p ${BUILD_DIR}  \
 ENV VERSION_OPENSSL=1.1.1t
 ENV OPENSSL_BUILD_DIR=${BUILD_DIR}/openssl
 ENV CA_BUNDLE_SOURCE="https://curl.se/ca/cacert.pem"
-ENV CA_BUNDLE="${INSTALL_DIR}/ssl/cert.pem"
+ENV CA_BUNDLE="${INSTALL_DIR}/bref/ssl/cert.pem"
 RUN set -xe; \
     mkdir -p ${OPENSSL_BUILD_DIR}; \
     curl -Ls  https://github.com/openssl/openssl/archive/OpenSSL_${VERSION_OPENSSL//./_}.tar.gz \
@@ -91,7 +91,7 @@ RUN CFLAGS="" \
     LDFLAGS="-L${INSTALL_DIR}/lib64 -L${INSTALL_DIR}/lib" \
     ./config \
         --prefix=${INSTALL_DIR} \
-        --openssldir=${INSTALL_DIR}/ssl \
+        --openssldir=${INSTALL_DIR}/bref/ssl \
         --release \
         no-tests \
         shared \
@@ -102,7 +102,7 @@ RUN CFLAGS="" \
 # https://stackoverflow.com/questions/28639207/why-cant-i-compile-openssl-with-multiple-threads-make-j3
 # Run `make install_sw install_ssldirs` instead of `make install` to skip installing man pages https://github.com/openssl/openssl/issues/8170
 RUN make -j1 install_sw install_ssldirs
-RUN curl -Lk -o ${CA_BUNDLE} ${CA_BUNDLE_SOURCE}
+RUN mkdir -p ${INSTALL_DIR}/bref/ssl && curl -Lk -o ${CA_BUNDLE} ${CA_BUNDLE_SOURCE}
 
 
 ###############################################################################
@@ -418,7 +418,7 @@ RUN pecl install APCu
 RUN mkdir -p /bref-layer/bin \
 &&  mkdir -p /bref-layer/lib \
 &&  mkdir -p /bref-layer/bref/extensions \
-&&  mkdir -p /bref-layer/ssl
+&&  mkdir -p /bref-layer/bref/ssl
 
 # Copy the PHP binary
 RUN cp ${INSTALL_DIR}/bin/php /bref-layer/bin/php && chmod +x /bref-layer/bin/php
@@ -439,7 +439,7 @@ RUN php /bref/lib-copy/copy-dependencies.php /bref-layer/bref/extensions/pdo_mys
 RUN php /bref/lib-copy/copy-dependencies.php /bref-layer/bref/extensions/pdo_pgsql.so /bref-layer/lib
 
 # Copy the OpenSSL certificates file
-RUN cp ${CA_BUNDLE} /bref-layer/ssl/cert.pem
+RUN cp ${CA_BUNDLE} /bref-layer/bref/ssl/cert.pem
 
 
 # ---------------------------------------------------------------

diff --git a/php-82/Dockerfile b/php-82/Dockerfile
@@ -80,7 +80,7 @@ RUN mkdir -p ${BUILD_DIR}  \
 ENV VERSION_OPENSSL=1.1.1t
 ENV OPENSSL_BUILD_DIR=${BUILD_DIR}/openssl
 ENV CA_BUNDLE_SOURCE="https://curl.se/ca/cacert.pem"
-ENV CA_BUNDLE="${INSTALL_DIR}/ssl/cert.pem"
+ENV CA_BUNDLE="${INSTALL_DIR}/bref/ssl/cert.pem"
 RUN set -xe; \
     mkdir -p ${OPENSSL_BUILD_DIR}; \
     curl -Ls  https://github.com/openssl/openssl/archive/OpenSSL_${VERSION_OPENSSL//./_}.tar.gz \
@@ -91,7 +91,7 @@ RUN CFLAGS="" \
     LDFLAGS="-L${INSTALL_DIR}/lib64 -L${INSTALL_DIR}/lib" \
     ./config \
         --prefix=${INSTALL_DIR} \
-        --openssldir=${INSTALL_DIR}/ssl \
+        --openssldir=${INSTALL_DIR}/bref/ssl \
         --release \
         no-tests \
         shared \
@@ -102,7 +102,7 @@ RUN CFLAGS="" \
 # https://stackoverflow.com/questions/28639207/why-cant-i-compile-openssl-with-multiple-threads-make-j3
 # Run `make install_sw install_ssldirs` instead of `make install` to skip installing man pages https://github.com/openssl/openssl/issues/8170
 RUN make -j1 install_sw install_ssldirs
-RUN curl -Lk -o ${CA_BUNDLE} ${CA_BUNDLE_SOURCE}
+RUN mkdir -p ${INSTALL_DIR}/bref/ssl && curl -Lk -o ${CA_BUNDLE} ${CA_BUNDLE_SOURCE}
 
 
 ###############################################################################
@@ -418,7 +418,7 @@ RUN pecl install APCu
 RUN mkdir -p /bref-layer/bin \
 &&  mkdir -p /bref-layer/lib \
 &&  mkdir -p /bref-layer/bref/extensions \
-&&  mkdir -p /bref-layer/ssl
+&&  mkdir -p /bref-layer/bref/ssl
 
 # Copy the PHP binary
 RUN cp ${INSTALL_DIR}/bin/php /bref-layer/bin/php && chmod +x /bref-layer/bin/php
@@ -439,7 +439,7 @@ RUN php /bref/lib-copy/copy-dependencies.php /bref-layer/bref/extensions/pdo_mys
 RUN php /bref/lib-copy/copy-dependencies.php /bref-layer/bref/extensions/pdo_pgsql.so /bref-layer/lib
 
 # Copy the OpenSSL certificates file
-RUN cp ${CA_BUNDLE} /bref-layer/ssl/cert.pem
+RUN cp ${CA_BUNDLE} /bref-layer/bref/ssl/cert.pem
 
 
 # ---------------------------------------------------------------

diff --git a/tests/test_2_extensions.php b/tests/test_2_extensions.php
@@ -85,6 +85,8 @@
     // Check that the default certificate file exists
     // https://github.com/brefphp/aws-lambda-layers/issues/53
     'curl-openssl-certificates' => file_exists(openssl_get_cert_locations()['default_cert_file']),
+    // Check its location has not changed (would be a breaking change)
+    'curl-openssl-certificates-location' => openssl_get_cert_locations()['default_cert_file'] === '/opt/bref/ssl/cert.pem',
     // Make sure we are using curl with our compiled libssh
     'curl-libssh' => version_compare(str_replace('libssh2/', '', curl_version()['libssh_version']), '1.10.0', '>='),
     'json' => function_exists('json_encode'),