From 1b9b256140e7bbdee805990e8c6a1886730283c1 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Willms <tleilax+github@gmail.com>
Date: Wed, 10 Jan 2024 16:12:00 +0100
Subject: [PATCH] fixes #1, re #2

---
 php/7.4-Dockerfile | 10 +++++++---
 php/8.0-Dockerfile | 10 +++++++---
 php/8.1-Dockerfile | 11 ++++++++---
 php/8.2-Dockerfile | 10 +++++++---
 php/8.3-Dockerfile | 10 +++++++---
 5 files changed, 36 insertions(+), 15 deletions(-)

diff --git a/php/7.4-Dockerfile b/php/7.4-Dockerfile
index 84b2392..6982eb4 100644
--- a/php/7.4-Dockerfile
+++ b/php/7.4-Dockerfile
@@ -36,6 +36,10 @@ RUN apt update \
 # Install Memcached
 RUN apt update \
     && apt install -y git libmemcached11 libmemcachedutil2 build-essential libmemcached-dev libz-dev \
-    && rm -rf /var/lib/apt/lists/*
-RUN git clone https://github.com/php-memcached-dev/php-memcached /usr/src/php/ext/memcached \
-    && docker-php-ext-install memcached
+    && rm -rf /var/lib/apt/lists/* \
+    && pecl install memcached \
+    && docker-php-ext-enable memcached
+
+# Install redis
+RUN pecl install redis \
+    && docker-php-ext-enable redis
diff --git a/php/8.0-Dockerfile b/php/8.0-Dockerfile
index 6531355..12ac368 100644
--- a/php/8.0-Dockerfile
+++ b/php/8.0-Dockerfile
@@ -36,6 +36,10 @@ RUN apt update \
 # Install Memcached
 RUN apt update \
     && apt install -y git libmemcached11 libmemcachedutil2 build-essential libmemcached-dev libz-dev \
-    && rm -rf /var/lib/apt/lists/*
-RUN git clone https://github.com/php-memcached-dev/php-memcached /usr/src/php/ext/memcached \
-    && docker-php-ext-install memcached
+    && rm -rf /var/lib/apt/lists/* \
+    && pecl install memcached \
+    && docker-php-ext-enable memcached
+
+# Install redis
+RUN pecl install redis \
+    && docker-php-ext-enable redis
diff --git a/php/8.1-Dockerfile b/php/8.1-Dockerfile
index 4444fe3..4c6e00d 100644
--- a/php/8.1-Dockerfile
+++ b/php/8.1-Dockerfile
@@ -36,6 +36,11 @@ RUN apt update \
 # Install Memcached
 RUN apt update \
     && apt install -y git libmemcached11 libmemcachedutil2 build-essential libmemcached-dev libz-dev \
-    && rm -rf /var/lib/apt/lists/*
-RUN git clone https://github.com/php-memcached-dev/php-memcached /usr/src/php/ext/memcached \
-    && docker-php-ext-install memcached
+    && rm -rf /var/lib/apt/lists/* \
+    && pecl install memcached \
+    && docker-php-ext-enable memcached
+
+
+# Install redis
+RUN pecl install redis \
+    && docker-php-ext-enable redis
diff --git a/php/8.2-Dockerfile b/php/8.2-Dockerfile
index 676a168..4bcd9f2 100644
--- a/php/8.2-Dockerfile
+++ b/php/8.2-Dockerfile
@@ -36,6 +36,10 @@ RUN apt update \
 # Install Memcached
 RUN apt update \
     && apt install -y git libmemcached11 libmemcachedutil2 build-essential libmemcached-dev libz-dev \
-    && rm -rf /var/lib/apt/lists/*
-RUN git clone https://github.com/php-memcached-dev/php-memcached /usr/src/php/ext/memcached \
-    && docker-php-ext-install memcached
+    && rm -rf /var/lib/apt/lists/* \
+    && pecl install memcached \
+    && docker-php-ext-enable memcached
+
+# Install redis
+RUN pecl install redis \
+    && docker-php-ext-enable redis
diff --git a/php/8.3-Dockerfile b/php/8.3-Dockerfile
index 534d526..17bddb2 100644
--- a/php/8.3-Dockerfile
+++ b/php/8.3-Dockerfile
@@ -36,6 +36,10 @@ RUN apt update \
 # Install Memcached
 RUN apt update \
     && apt install -y git libmemcached11 libmemcachedutil2 build-essential libmemcached-dev libz-dev \
-    && rm -rf /var/lib/apt/lists/*
-RUN git clone https://github.com/php-memcached-dev/php-memcached /usr/src/php/ext/memcached \
-    && docker-php-ext-install memcached
+    && rm -rf /var/lib/apt/lists/* \
+    && pecl install memcached \
+    && docker-php-ext-enable memcached
+
+# Install redis
+RUN pecl install redis \
+    && docker-php-ext-enable redis
-- 
GitLab