From 6d37e66cd13053a9175d8ca8f114cbd145e374b2 Mon Sep 17 00:00:00 2001
From: Daniel Vaz Gaspar <danielvazgaspar@gmail.com>
Date: Mon, 16 Jan 2023 15:45:32 +0000
Subject: [PATCH] chore: Use redis 7 on tests and pin on local dev and non-dev
 (#22742)

---
 .github/workflows/superset-applitool-cypress.yml      | 2 +-
 .github/workflows/superset-cli.yml                    | 2 +-
 .github/workflows/superset-e2e.yml                    | 2 +-
 .github/workflows/superset-python-integrationtest.yml | 6 +++---
 .github/workflows/superset-python-presto-hive.yml     | 4 ++--
 docker-compose-non-dev.yml                            | 4 ++--
 docker-compose.yml                                    | 2 +-
 7 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/superset-applitool-cypress.yml b/.github/workflows/superset-applitool-cypress.yml
index eb7d77423..47fc1a24e 100644
--- a/.github/workflows/superset-applitool-cypress.yml
+++ b/.github/workflows/superset-applitool-cypress.yml
@@ -32,7 +32,7 @@ jobs:
         ports:
           - 15432:5432
       redis:
-        image: redis:5-alpine
+        image: redis:7-alpine
         ports:
           - 16379:6379
     steps:
diff --git a/.github/workflows/superset-cli.yml b/.github/workflows/superset-cli.yml
index 369447e15..65ec8b018 100644
--- a/.github/workflows/superset-cli.yml
+++ b/.github/workflows/superset-cli.yml
@@ -30,7 +30,7 @@ jobs:
           # GitHub action runner's default installations
           - 15432:5432
       redis:
-        image: redis:5-alpine
+        image: redis:7-alpine
         ports:
           - 16379:6379
     steps:
diff --git a/.github/workflows/superset-e2e.yml b/.github/workflows/superset-e2e.yml
index f936b544a..ab82731ac 100644
--- a/.github/workflows/superset-e2e.yml
+++ b/.github/workflows/superset-e2e.yml
@@ -38,7 +38,7 @@ jobs:
         ports:
           - 15432:5432
       redis:
-        image: redis:5-alpine
+        image: redis:7-alpine
         ports:
           - 16379:6379
     steps:
diff --git a/.github/workflows/superset-python-integrationtest.yml b/.github/workflows/superset-python-integrationtest.yml
index 926d6185b..eae19b234 100644
--- a/.github/workflows/superset-python-integrationtest.yml
+++ b/.github/workflows/superset-python-integrationtest.yml
@@ -29,7 +29,7 @@ jobs:
         ports:
           - 13306:3306
       redis:
-        image: redis:5-alpine
+        image: redis:7-alpine
         options: --entrypoint redis-server
         ports:
           - 16379:6379
@@ -97,7 +97,7 @@ jobs:
           # GitHub action runner's default installations
           - 15432:5432
       redis:
-        image: redis:5-alpine
+        image: redis:7-alpine
         ports:
           - 16379:6379
     steps:
@@ -156,7 +156,7 @@ jobs:
         sqlite:///${{ github.workspace }}/.temp/unittest.db
     services:
       redis:
-        image: redis:5-alpine
+        image: redis:7-alpine
         ports:
           - 16379:6379
     steps:
diff --git a/.github/workflows/superset-python-presto-hive.yml b/.github/workflows/superset-python-presto-hive.yml
index 097b2f45a..875901b1e 100644
--- a/.github/workflows/superset-python-presto-hive.yml
+++ b/.github/workflows/superset-python-presto-hive.yml
@@ -41,7 +41,7 @@ jobs:
           # GitHub action runner's default installations
           - 15433:8080
       redis:
-        image: redis:5-alpine
+        image: redis:7-alpine
         ports:
           - 16379:6379
     steps:
@@ -110,7 +110,7 @@ jobs:
           # GitHub action runner's default installations
           - 15432:5432
       redis:
-        image: redis:5-alpine
+        image: redis:7-alpine
         ports:
           - 16379:6379
     steps:
diff --git a/docker-compose-non-dev.yml b/docker-compose-non-dev.yml
index d0c4bd54c..e72222655 100644
--- a/docker-compose-non-dev.yml
+++ b/docker-compose-non-dev.yml
@@ -26,7 +26,7 @@ x-superset-volumes: &superset-volumes
 version: "3.7"
 services:
   redis:
-    image: redis:latest
+    image: redis:7
     container_name: superset_cache
     restart: unless-stopped
     volumes:
@@ -34,7 +34,7 @@ services:
 
   db:
     env_file: docker/.env-non-dev
-    image: postgres:10
+    image: postgres:14
     container_name: superset_db
     restart: unless-stopped
     volumes:
diff --git a/docker-compose.yml b/docker-compose.yml
index b6dfb99e5..89aecfd9e 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -30,7 +30,7 @@ x-superset-volumes: &superset-volumes
 version: "3.7"
 services:
   redis:
-    image: redis:latest
+    image: redis:7
     container_name: superset_cache
     restart: unless-stopped
     ports: