Merge branch 'z_TEMP_Fix_PHP_84' into php84

elastic · Jan 16, 2025 · 61a4ac8 · 61a4ac8
2 parents 99ad6fa + 1b04a28
commit 61a4ac8
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 5 deletions.
diff --git a/packaging/test/alpine/Dockerfile b/packaging/test/alpine/Dockerfile
@@ -15,7 +15,6 @@ RUN apk update \
         wget
 
 RUN docker-php-ext-install \
-        ds \
         mysqli \
         pcntl \
         pdo_mysql \

diff --git a/packaging/test/centos/Dockerfile b/packaging/test/centos/Dockerfile
@@ -24,7 +24,6 @@ RUN export PHP_VERSION_TRANSFORMED=$(echo "${PHP_VERSION}" | sed 's#\.##g') \
     && yum-config-manager --enable remi-php${PHP_VERSION_TRANSFORMED} \
     && yum install -y \
             php \
-            php-ds \
             php-mbstring \
             php-mysqli \
             php-pcntl \

diff --git a/packaging/test/ubuntu/Dockerfile b/packaging/test/ubuntu/Dockerfile
@@ -20,7 +20,6 @@ RUN apt-get -qq update \
     && rm -rf /var/lib/apt/lists/*
 
 RUN docker-php-ext-install \
-        ds \
         mysqli \
         pcntl \
         pdo_mysql \

diff --git a/packaging/test/ubuntu/apache/Dockerfile b/packaging/test/ubuntu/apache/Dockerfile
@@ -31,7 +31,6 @@ RUN apt-get -qq -y --no-install-recommends install software-properties-common \
         php${PHP_VERSION} \
         libapache2-mod-php \
         php${PHP_VERSION}-curl \
-        php${PHP_VERSION}-ds \
         php${PHP_VERSION}-mbstring \
         php${PHP_VERSION}-mysql \
         php${PHP_VERSION}-mysqli \

diff --git a/packaging/test/ubuntu/fpm/Dockerfile b/packaging/test/ubuntu/fpm/Dockerfile
@@ -31,7 +31,6 @@ RUN apt-get -qq -y --no-install-recommends install software-properties-common \
         php${PHP_VERSION} \
         libapache2-mod-fcgid \
         php${PHP_VERSION}-curl \
-        php${PHP_VERSION}-ds \
         php${PHP_VERSION}-fpm \
         php${PHP_VERSION}-mbstring \
         php${PHP_VERSION}-mysql \
-Original file line number
+Diff line change
@@ Expand Up / @@ -15,7 +15,6 @@ RUN apk update \ @@
             wget
     RUN docker-php-ext-install \
-            ds \
             mysqli \
             pcntl \
             pdo_mysql \
@@ Expand Down @@