From 23a9bfe307dd0596a81f48bb074b0c744acbb75c Mon Sep 17 00:00:00 2001
From: Steven Dubois <sdu@emakina.fr>
Date: Tue, 21 Sep 2021 12:24:08 +0200
Subject: [PATCH] Add DOCKER_REDIS_IMAGE environment variable

---
 .env.dist          | 1 +
 Makefile           | 2 ++
 docker-compose.yml | 2 +-
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/.env.dist b/.env.dist
index e3c54a4..af9c8cb 100644
--- a/.env.dist
+++ b/.env.dist
@@ -1,6 +1,7 @@
 DOCKER_PHP_IMAGE=7.4
 DOCKER_MYSQL_IMAGE=latest
 DOCKER_ELASTICSEARCH_IMAGE=7.6
+DOCKER_REDIS_IMAGE=6.2
 
 #COMPOSER_DOWNGRADE=1
 
diff --git a/Makefile b/Makefile
index f423e4b..35ff403 100644
--- a/Makefile
+++ b/Makefile
@@ -12,6 +12,7 @@ export PROJECT_LOCATION := $(shell echo ${MAKEFILE_DIRECTORY})
 export DOCKER_PHP_IMAGE := $(shell grep DOCKER_PHP_IMAGE ${MAKEFILE_DIRECTORY}docker/local/.env | awk -F '=' '{print $$NF}')
 export DOCKER_MYSQL_IMAGE := $(shell grep DOCKER_MYSQL_IMAGE ${MAKEFILE_DIRECTORY}docker/local/.env | awk -F '=' '{print $$NF}')
 export DOCKER_ELASTICSEARCH_IMAGE := $(shell grep DOCKER_ELASTICSEARCH_IMAGE ${MAKEFILE_DIRECTORY}docker/local/.env | awk -F '=' '{print $$NF}')
+export DOCKER_REDIS_IMAGE := $(shell grep DOCKER_REDIS_IMAGE ${MAKEFILE_DIRECTORY}docker/local/.env | awk -F '=' '{print $$NF}')
 
 ##
 ## ----------------------------------------------------------------------------
@@ -73,6 +74,7 @@ root: ## Display the commands to set up the environment for an advanced usage
 	@echo "export DOCKER_PHP_IMAGE=${DOCKER_PHP_IMAGE}"
 	@echo "export DOCKER_MYSQL_IMAGE=${DOCKER_MYSQL_IMAGE}"
 	@echo "export DOCKER_ELASTICSEARCH_IMAGE=${DOCKER_ELASTICSEARCH_IMAGE}"
+	@echo "export DOCKER_REDIS_IMAGE=${DOCKER_REDIS_IMAGE}"
 	@echo ""
 	@echo "# Run this command to configure your shell:"
 	@echo "# eval \$$(make root)"
diff --git a/docker-compose.yml b/docker-compose.yml
index 604daac..06de452 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -61,7 +61,7 @@ services:
     tty: true
 
   redis:
-    image: redis:3.2-alpine
+    image: redis:${DOCKER_REDIS_IMAGE}-alpine
     env_file: ${PROJECT_LOCATION}/docker/local/.env
     volumes:
       - redis:/data