Aligining the Dockerfile with the version in friendica/docker repository

diff --git a/.devcontainer/.env b/.devcontainer/.env
index fdfc59f864a5b0765d17a5b69dabdee7b7881367..396ac9ebfe76016672c93e46c66da4a953969795 100644 (file)
--- a/.devcontainer/.env
+++ b/.devcontainer/.env
@@ -4,6 +4,9 @@ MYSQL_DATABASE=friendica
 MYSQL_USER=friendica
 MYSQL_PASSWORD=friendica
 
+#Redis
+REDIS_HOST=127.0.0.1
+
 #Webserver setup
 ServerName=localhost
 ServerPort=8080

diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index 05232b832958e2df91c6790cf3205ea546bfae3b..4867640812098df93f7eecfa9a31a552e6dd3d9e 100644 (file)
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -61,13 +61,13 @@ RUN apt-get install -y --no-install-recommends \
 # pecl will claim success even if one install fails, so we need to perform each install separately
 RUN pecl install apcu-${apcu_version}; \
         pecl install memcached-${memcached_version}; \
-#       pecl install redis-${redis_version}; \
-#       pecl install imagick-${imagick_version}; \
+        pecl install redis-${redis_version}; \
+        pecl install imagick-${imagick_version}; \
         docker-php-ext-enable \
             apcu \
-            memcached
-#            redis \
-#            imagick
+            memcached \
+            redis \
+            imagick
 
 RUN apt-get clean -y && rm -rf /var/lib/apt/lists/*
 

diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml
index 74a16d6187962819da9db4b15ed9f1669eb58c03..4463ebad86c593faeee4ed7350fc046995f6c374 100644 (file)
--- a/.devcontainer/docker-compose.yml
+++ b/.devcontainer/docker-compose.yml
@@ -37,7 +37,13 @@ services:
 
     # Runs app on the same network as the app container, allows "forwardPorts" in devcontainer.json function.
     network_mode: service:app
-  
+
+  redis:
+    image: redis:latest
+    restart: unless-stopped
+    env_file: ".env"
+    network_mode: service:app
+
 volumes:
   mariadb-data: