From 8b34fef548f3be935456e7c53269f1dc5a364730 Mon Sep 17 00:00:00 2001
From: Cees-Jan Kiewiet <github@ceesjankiewiet.nl>
Date: Sun, 9 Feb 2025 20:52:26 +0100
Subject: [PATCH] Ensure ext-random is enabled

---
 .github/workflows/ci.yml       | 2 +-
 Dockerfile-nts-alpine          | 3 +--
 Dockerfile-nts-debian          | 3 +--
 Dockerfile-zts-alpine          | 3 +--
 Dockerfile-zts-debian          | 3 +--
 test/container/test_php_ext.py | 2 +-
 6 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 0eb22c38..4e504324 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -152,7 +152,7 @@ jobs:
         with:
           timeout_minutes: 120
           retry_wait_seconds: 30
-          max_attempts: 5
+          max_attempts: 13
           command: (echo "${{ needs.supported-arch-matrix.outputs.arch }}" | jq -r '.[]') | xargs -I % ./build-php.sh $(echo "${{ matrix.image }}" | tr '-' ' ') %
       - run: cat ./docker-image/image.tags | xargs -I % docker inspect --format='%={{.Id}}:{{index .Config.Env 7}}' %
       - run: docker save "${DOCKER_IMAGE}" | gzip -9 > ./docker-image/image.tar
diff --git a/Dockerfile-nts-alpine b/Dockerfile-nts-alpine
index 07ebb8f5..8ab98cf7 100644
--- a/Dockerfile-nts-alpine
+++ b/Dockerfile-nts-alpine
@@ -73,8 +73,7 @@ RUN EXTENSION_DIR=`php-config --extension-dir 2>/dev/null` && \
         $PHPIZE_DEPS \
     ## Install PECL
     && wget -q pear.php.net/go-pear.phar && php go-pear.phar \
-    && install-php-extensions pcntl pgsql pdo pdo_pgsql bcmath zip gmp iconv opcache intl sockets \
-    && (install-php-extensions random || true) \
+    && install-php-extensions pcntl pgsql pdo pdo_pgsql bcmath zip gmp iconv opcache intl sockets random \
     && (pecl install eio || pecl install eio-beta) \
     && docker-php-ext-enable eio \
     && pecl install event \
diff --git a/Dockerfile-nts-debian b/Dockerfile-nts-debian
index b46779ea..b7c14916 100644
--- a/Dockerfile-nts-debian
+++ b/Dockerfile-nts-debian
@@ -71,8 +71,7 @@ RUN EXTENSION_DIR=`php-config --extension-dir 2>/dev/null` && \
         wget \
         gdb \
         $PHPIZE_DEPS \
-    && docker-php-ext-install -j$(nproc) pcntl pgsql pdo pdo_pgsql bcmath zip gmp iconv intl sockets \
-    && (docker-php-ext-install -j$(nproc) random || true) \
+    && docker-php-ext-install -j$(nproc) pcntl pgsql pdo pdo_pgsql bcmath zip gmp iconv intl sockets random \
     && (pecl install eio || pecl install eio-beta) \
     && docker-php-ext-enable eio \
     && pecl install event \
diff --git a/Dockerfile-zts-alpine b/Dockerfile-zts-alpine
index 6f20699f..38056921 100644
--- a/Dockerfile-zts-alpine
+++ b/Dockerfile-zts-alpine
@@ -77,8 +77,7 @@ RUN EXTENSION_DIR=`php-config --extension-dir 2>/dev/null` && \
         $PHPIZE_DEPS \
     ## Install PECL
     && wget -q pear.php.net/go-pear.phar && php go-pear.phar \
-    && install-php-extensions pcntl pgsql pdo pdo_pgsql bcmath zip gmp iconv opcache intl sockets \
-    && (install-php-extensions random || true) \
+    && install-php-extensions pcntl pgsql pdo pdo_pgsql bcmath zip gmp iconv opcache intl sockets random \
     && pecl install parallel || pecl install parallel-1.1.4 \
     && docker-php-ext-enable parallel \
     && (pecl install eio || pecl install eio-beta) \
diff --git a/Dockerfile-zts-debian b/Dockerfile-zts-debian
index 7647e0b7..d5a516d5 100644
--- a/Dockerfile-zts-debian
+++ b/Dockerfile-zts-debian
@@ -72,8 +72,7 @@ RUN EXTENSION_DIR=`php-config --extension-dir 2>/dev/null` && \
         wget \
         gdb \
         $PHPIZE_DEPS \
-    && docker-php-ext-install -j$(nproc) pcntl pgsql pdo pdo_pgsql bcmath zip gmp iconv intl sockets \
-    && (docker-php-ext-install -j$(nproc) random || true) \
+    && docker-php-ext-install -j$(nproc) pcntl pgsql pdo pdo_pgsql bcmath zip gmp iconv intl sockets random \
     && pecl install parallel || pecl install parallel-1.1.4 \
     && docker-php-ext-enable parallel \
     && (pecl install eio || pecl install eio-beta) \
diff --git a/test/container/test_php_ext.py b/test/container/test_php_ext.py
index 1d95a74e..2c283d7e 100644
--- a/test/container/test_php_ext.py
+++ b/test/container/test_php_ext.py
@@ -81,4 +81,4 @@ def test_zip_is_loaded(host):
 def test_zip_is_loaded(host):
     output = host.run('php -r "exit(function_exists(\'mt_rand\') ? 0 : 255);"')
     assert output.rc == 0
-#     assert 'random' in host.run('php -m').stdout
+    assert 'random' in host.run('php -m').stdout