Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 5 additions & 11 deletions php-82/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -150,19 +150,18 @@ RUN CFLAGS="-fstack-protector-strong -fpic -fpie -Os -I${INSTALL_DIR}/include -I
--enable-exif \
--enable-ftp \
--with-gettext \
--enable-mbstring \
--enable-mbstring=shared \
--with-pdo-mysql=mysqlnd \
--with-mysqli \
--enable-pcntl \
--with-zip \
--enable-bcmath \
--with-pdo-pgsql=shared \
--with-pdo-pgsql \
# Separate .so extension so that it is not loaded by default
--enable-intl=shared \
# Separate .so extension so that it is not loaded by default
--enable-soap=shared \
# Separate .so extension so that it is not loaded by default
--with-xsl=${INSTALL_DIR} \
--with-xsl \
--with-ffi \
# necessary for `pecl` to work (to install PHP extensions)
--with-pear \
Expand Down Expand Up @@ -203,13 +202,8 @@ RUN cp $(php -r 'echo ini_get("extension_dir");')/* /bref-layer/bref/extensions/
# - /opt/bin | /opt/lib | /opt/lib64 (libraries compiled from source)
# into `/bref-layer` (the temp directory for the future Lambda layer)
COPY --link utils/lib-copy /bref/lib-copy
RUN php /bref/lib-copy/copy-dependencies.php /bref-layer/bin/php /bref-layer/lib
RUN php /bref/lib-copy/copy-dependencies.php /bref-layer/bin/php-fpm /bref-layer/lib
RUN php /bref/lib-copy/copy-dependencies.php /bref-layer/bref/extensions/apcu.so /bref-layer/lib
RUN php /bref/lib-copy/copy-dependencies.php /bref-layer/bref/extensions/intl.so /bref-layer/lib
RUN php /bref/lib-copy/copy-dependencies.php /bref-layer/bref/extensions/opcache.so /bref-layer/lib
RUN php /bref/lib-copy/copy-dependencies.php /bref-layer/bref/extensions/pdo_mysql.so /bref-layer/lib
RUN php /bref/lib-copy/copy-dependencies.php /bref-layer/bref/extensions/pdo_pgsql.so /bref-layer/lib
RUN php /bref/lib-copy/copy-dependencies.php /bref-layer/bin /bref-layer/lib
RUN php /bref/lib-copy/copy-dependencies.php /bref-layer/bref/extensions /bref-layer/lib

# Create a symbolic link to the OpenSSL certificates file for BC purposes
RUN ln -s /etc/ssl/cert.pem /bref-layer/bref/ssl/cert.pem
Expand Down
16 changes: 5 additions & 11 deletions php-83/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -150,19 +150,18 @@ RUN CFLAGS="-fstack-protector-strong -fpic -fpie -Os -I${INSTALL_DIR}/include -I
--enable-exif \
--enable-ftp \
--with-gettext \
--enable-mbstring \
--enable-mbstring=shared \
--with-pdo-mysql=mysqlnd \
--with-mysqli \
--enable-pcntl \
--with-zip \
--enable-bcmath \
--with-pdo-pgsql=shared \
--with-pdo-pgsql \
# Separate .so extension so that it is not loaded by default
--enable-intl=shared \
# Separate .so extension so that it is not loaded by default
--enable-soap=shared \
# Separate .so extension so that it is not loaded by default
--with-xsl=${INSTALL_DIR} \
--with-xsl \
--with-ffi \
# necessary for `pecl` to work (to install PHP extensions)
--with-pear \
Expand Down Expand Up @@ -203,13 +202,8 @@ RUN cp $(php -r 'echo ini_get("extension_dir");')/* /bref-layer/bref/extensions/
# - /opt/bin | /opt/lib | /opt/lib64 (libraries compiled from source)
# into `/bref-layer` (the temp directory for the future Lambda layer)
COPY --link utils/lib-copy /bref/lib-copy
RUN php /bref/lib-copy/copy-dependencies.php /bref-layer/bin/php /bref-layer/lib
RUN php /bref/lib-copy/copy-dependencies.php /bref-layer/bin/php-fpm /bref-layer/lib
RUN php /bref/lib-copy/copy-dependencies.php /bref-layer/bref/extensions/apcu.so /bref-layer/lib
RUN php /bref/lib-copy/copy-dependencies.php /bref-layer/bref/extensions/intl.so /bref-layer/lib
RUN php /bref/lib-copy/copy-dependencies.php /bref-layer/bref/extensions/opcache.so /bref-layer/lib
RUN php /bref/lib-copy/copy-dependencies.php /bref-layer/bref/extensions/pdo_mysql.so /bref-layer/lib
RUN php /bref/lib-copy/copy-dependencies.php /bref-layer/bref/extensions/pdo_pgsql.so /bref-layer/lib
RUN php /bref/lib-copy/copy-dependencies.php /bref-layer/bin /bref-layer/lib
RUN php /bref/lib-copy/copy-dependencies.php /bref-layer/bref/extensions /bref-layer/lib

# Create a symbolic link to the OpenSSL certificates file for BC purposes
RUN ln -s /etc/ssl/cert.pem /bref-layer/bref/ssl/cert.pem
Expand Down
16 changes: 5 additions & 11 deletions php-84/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -149,19 +149,18 @@ RUN CFLAGS="-fstack-protector-strong -fpic -fpie -Os -I${INSTALL_DIR}/include -I
--enable-exif \
--enable-ftp \
--with-gettext \
--enable-mbstring \
--enable-mbstring=shared \
--with-pdo-mysql=mysqlnd \
--with-mysqli \
--enable-pcntl \
--with-zip \
--enable-bcmath \
--with-pdo-pgsql=shared \
--with-pdo-pgsql \
# Separate .so extension so that it is not loaded by default
--enable-intl=shared \
# Separate .so extension so that it is not loaded by default
--enable-soap=shared \
# Separate .so extension so that it is not loaded by default
--with-xsl=${INSTALL_DIR} \
--with-xsl \
--with-ffi \
# necessary for `pecl` to work (to install PHP extensions)
--with-pear \
Expand Down Expand Up @@ -202,13 +201,8 @@ RUN cp $(php -r 'echo ini_get("extension_dir");')/* /bref-layer/bref/extensions/
# - /opt/bin | /opt/lib | /opt/lib64 (libraries compiled from source)
# into `/bref-layer` (the temp directory for the future Lambda layer)
COPY --link utils/lib-copy /bref/lib-copy
RUN php /bref/lib-copy/copy-dependencies.php /bref-layer/bin/php /bref-layer/lib
RUN php /bref/lib-copy/copy-dependencies.php /bref-layer/bin/php-fpm /bref-layer/lib
RUN php /bref/lib-copy/copy-dependencies.php /bref-layer/bref/extensions/apcu.so /bref-layer/lib
RUN php /bref/lib-copy/copy-dependencies.php /bref-layer/bref/extensions/intl.so /bref-layer/lib
RUN php /bref/lib-copy/copy-dependencies.php /bref-layer/bref/extensions/opcache.so /bref-layer/lib
RUN php /bref/lib-copy/copy-dependencies.php /bref-layer/bref/extensions/pdo_mysql.so /bref-layer/lib
RUN php /bref/lib-copy/copy-dependencies.php /bref-layer/bref/extensions/pdo_pgsql.so /bref-layer/lib
RUN php /bref/lib-copy/copy-dependencies.php /bref-layer/bin /bref-layer/lib
RUN php /bref/lib-copy/copy-dependencies.php /bref-layer/bref/extensions /bref-layer/lib

# Create a symbolic link to the OpenSSL certificates file for BC purposes
RUN ln -s /etc/ssl/cert.pem /bref-layer/bref/ssl/cert.pem
Expand Down
16 changes: 5 additions & 11 deletions php-85/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -149,19 +149,18 @@ RUN CFLAGS="-fstack-protector-strong -fpic -fpie -Os -I${INSTALL_DIR}/include -I
--enable-exif \
--enable-ftp \
--with-gettext \
--enable-mbstring \
--enable-mbstring=shared \
--with-pdo-mysql=mysqlnd \
--with-mysqli \
--enable-pcntl \
--with-zip \
--enable-bcmath \
--with-pdo-pgsql=shared \
--with-pdo-pgsql \
# Separate .so extension so that it is not loaded by default
--enable-intl=shared \
# Separate .so extension so that it is not loaded by default
--enable-soap=shared \
# Separate .so extension so that it is not loaded by default
--with-xsl=${INSTALL_DIR} \
--with-xsl \
--with-ffi \
# necessary for `pecl` to work (to install PHP extensions)
--with-pear \
Expand Down Expand Up @@ -202,13 +201,8 @@ RUN cp $(php -r 'echo ini_get("extension_dir");')/* /bref-layer/bref/extensions/
# - /opt/bin | /opt/lib | /opt/lib64 (libraries compiled from source)
# into `/bref-layer` (the temp directory for the future Lambda layer)
COPY --link utils/lib-copy /bref/lib-copy
RUN php /bref/lib-copy/copy-dependencies.php /bref-layer/bin/php /bref-layer/lib
RUN php /bref/lib-copy/copy-dependencies.php /bref-layer/bin/php-fpm /bref-layer/lib
RUN php /bref/lib-copy/copy-dependencies.php /bref-layer/bref/extensions/apcu.so /bref-layer/lib
RUN php /bref/lib-copy/copy-dependencies.php /bref-layer/bref/extensions/intl.so /bref-layer/lib
RUN php /bref/lib-copy/copy-dependencies.php /bref-layer/bref/extensions/opcache.so /bref-layer/lib
RUN php /bref/lib-copy/copy-dependencies.php /bref-layer/bref/extensions/pdo_mysql.so /bref-layer/lib
RUN php /bref/lib-copy/copy-dependencies.php /bref-layer/bref/extensions/pdo_pgsql.so /bref-layer/lib
RUN php /bref/lib-copy/copy-dependencies.php /bref-layer/bin /bref-layer/lib
RUN php /bref/lib-copy/copy-dependencies.php /bref-layer/bref/extensions /bref-layer/lib

# Create a symbolic link to the OpenSSL certificates file for BC purposes
RUN ln -s /etc/ssl/cert.pem /bref-layer/bref/ssl/cert.pem
Expand Down
2 changes: 2 additions & 0 deletions src/php-85.ini
Original file line number Diff line number Diff line change
Expand Up @@ -51,3 +51,5 @@ post_max_size=6M
upload_max_filesize=6M

extension_dir=/opt/bref/extensions
; Extensions enabled by default
extension=mbstring
1 change: 1 addition & 0 deletions src/php.ini
Original file line number Diff line number Diff line change
Expand Up @@ -52,4 +52,5 @@ upload_max_filesize=6M

extension_dir=/opt/bref/extensions
; Extensions enabled by default
extension=mbstring
zend_extension=opcache.so
3 changes: 2 additions & 1 deletion tests/test_2_extensions.php
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,7 @@
'opcache' => ini_get('opcache.enable') == 1,
'pdo' => class_exists(\PDO::class),
'pdo_mysql' => extension_loaded('pdo_mysql'),
'pdo_pgsql' => extension_loaded('pdo_pgsql'),
'pdo_sqlite' => extension_loaded('pdo_sqlite'),
'phar' => extension_loaded('phar'),
'posix' => function_exists('posix_getpgid'),
Expand Down Expand Up @@ -144,7 +145,7 @@
$extensionsDisabledByDefault = [
'intl' => class_exists(\Collator::class),
'apcu' => function_exists('apcu_add'),
'pdo_pgsql' => extension_loaded('pdo_pgsql'),
'soap' => class_exists(\SoapClient::class),
];
foreach ($extensionsDisabledByDefault as $extension => $test) {
if ($test) {
Expand Down
1 change: 0 additions & 1 deletion tests/test_3_manual_enabling_extensions.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
$extensions = [
'intl' => class_exists(\Collator::class),
'apcu' => function_exists('apcu_add'),
'pdo_pgsql' => extension_loaded('pdo_pgsql'),
'soap' => class_exists(\SoapClient::class),
];

Expand Down
1 change: 0 additions & 1 deletion tests/test_3_manual_extensions.ini
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
extension=intl
extension=apcu
extension=pdo_pgsql
extension=soap
15 changes: 14 additions & 1 deletion utils/lib-copy/copy-dependencies.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
*
* Usage:
* php copy-dependencies.php <file-to-analyze> <target-directory>
* It also works with directories:
* php copy-dependencies.php <directory-to-analyze> <target-directory>
*
* For example:
* php copy-dependencies.php /opt/bin/php /opt/lib
Expand Down Expand Up @@ -45,7 +47,18 @@
;
});

$requiredLibraries = listDependencies($pathToCheck);
if (is_file($pathToCheck)) {
$requiredLibraries = listDependencies($pathToCheck);
} elseif (is_dir($pathToCheck)) {
$requiredLibraries = [];
foreach (glob($pathToCheck . '/*') as $file) {
if (is_file($file)) {
$requiredLibraries = array_merge($requiredLibraries, listDependencies($file));
}
}
} else {
throw new RuntimeException("The path to check is neither a file nor a directory: $pathToCheck");
}
// Exclude existing system libraries
$requiredLibraries = array_filter($requiredLibraries, function (string $lib) use ($librariesThatExistOnLambda) {
// Libraries that we compiled are in /opt/lib or /opt/lib64, we compiled them because they are more
Expand Down