From cf255f45380a1532fe7ce64b17d5bc7fbf9bde44 Mon Sep 17 00:00:00 2001 From: ne20002 Date: Sat, 31 Aug 2024 14:54:05 +0000 Subject: [PATCH] Aligining the Dockerfile with the version in friendica/docker repository --- .devcontainer/.env | 3 +++ .devcontainer/Dockerfile | 10 +++++----- .devcontainer/docker-compose.yml | 8 +++++++- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/.devcontainer/.env b/.devcontainer/.env index fdfc59f864..396ac9ebfe 100644 --- 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 05232b8329..4867640812 100644 --- 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 74a16d6187..4463ebad86 100644 --- 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: