From c17accc0b4154e955a4e3dbd827dc9106dab9597 Mon Sep 17 00:00:00 2001
From: Sebastian Liebscher
 <112352529+sebastianliebscher@users.noreply.github.com>
Date: Mon, 24 Jul 2023 19:09:41 +0200
Subject: [PATCH] chore: bump postgresql in docker-compose and github workflows
 (#24147)

---
 .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 | 2 +-
 .github/workflows/superset-python-presto-hive.yml     | 4 ++--
 docker-compose-non-dev.yml                            | 2 +-
 docker-compose.yml                                    | 2 +-
 docs/docs/installation/configuring-superset.mdx       | 8 ++++----
 8 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/superset-applitool-cypress.yml b/.github/workflows/superset-applitool-cypress.yml
index 6707fb05b7..21ace62b02 100644
--- a/.github/workflows/superset-applitool-cypress.yml
+++ b/.github/workflows/superset-applitool-cypress.yml
@@ -40,7 +40,7 @@ jobs:
       APPLITOOLS_BATCH_NAME: Superset Cypress
     services:
       postgres:
-        image: postgres:14-alpine
+        image: postgres:15-alpine
         env:
           POSTGRES_USER: superset
           POSTGRES_PASSWORD: superset
diff --git a/.github/workflows/superset-cli.yml b/.github/workflows/superset-cli.yml
index dec013326e..faf6d7d0b2 100644
--- a/.github/workflows/superset-cli.yml
+++ b/.github/workflows/superset-cli.yml
@@ -20,7 +20,7 @@ jobs:
       SUPERSET__SQLALCHEMY_DATABASE_URI: postgresql+psycopg2://superset:superset@127.0.0.1:15432/superset
     services:
       postgres:
-        image: postgres:14-alpine
+        image: postgres:15-alpine
         env:
           POSTGRES_USER: superset
           POSTGRES_PASSWORD: superset
diff --git a/.github/workflows/superset-e2e.yml b/.github/workflows/superset-e2e.yml
index 031aa04f7b..5eb794a485 100644
--- a/.github/workflows/superset-e2e.yml
+++ b/.github/workflows/superset-e2e.yml
@@ -33,7 +33,7 @@ jobs:
       GITHUB_TOKEN: ${{ github.token }}
     services:
       postgres:
-        image: postgres:14-alpine
+        image: postgres:15-alpine
         env:
           POSTGRES_USER: superset
           POSTGRES_PASSWORD: superset
diff --git a/.github/workflows/superset-python-integrationtest.yml b/.github/workflows/superset-python-integrationtest.yml
index 460ddb3dda..f2caf2de38 100644
--- a/.github/workflows/superset-python-integrationtest.yml
+++ b/.github/workflows/superset-python-integrationtest.yml
@@ -86,7 +86,7 @@ jobs:
       SUPERSET__SQLALCHEMY_DATABASE_URI: postgresql+psycopg2://superset:superset@127.0.0.1:15432/superset
     services:
       postgres:
-        image: postgres:14-alpine
+        image: postgres:15-alpine
         env:
           POSTGRES_USER: superset
           POSTGRES_PASSWORD: superset
diff --git a/.github/workflows/superset-python-presto-hive.yml b/.github/workflows/superset-python-presto-hive.yml
index 64811b49bc..04cdf64d0b 100644
--- a/.github/workflows/superset-python-presto-hive.yml
+++ b/.github/workflows/superset-python-presto-hive.yml
@@ -22,7 +22,7 @@ jobs:
       SUPERSET__SQLALCHEMY_EXAMPLES_URI: presto://localhost:15433/memory/default
     services:
       postgres:
-        image: postgres:14-alpine
+        image: postgres:15-alpine
         env:
           POSTGRES_USER: superset
           POSTGRES_PASSWORD: superset
@@ -99,7 +99,7 @@ jobs:
       UPLOAD_FOLDER: /tmp/.superset/uploads/
     services:
       postgres:
-        image: postgres:14-alpine
+        image: postgres:15-alpine
         env:
           POSTGRES_USER: superset
           POSTGRES_PASSWORD: superset
diff --git a/docker-compose-non-dev.yml b/docker-compose-non-dev.yml
index 0ce96e00ba..8fd1d5ed32 100644
--- a/docker-compose-non-dev.yml
+++ b/docker-compose-non-dev.yml
@@ -34,7 +34,7 @@ services:
 
   db:
     env_file: docker/.env-non-dev
-    image: postgres:14
+    image: postgres:15
     container_name: superset_db
     restart: unless-stopped
     volumes:
diff --git a/docker-compose.yml b/docker-compose.yml
index bd965f156a..2b8ad0cc47 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -40,7 +40,7 @@ services:
 
   db:
     env_file: docker/.env
-    image: postgres:14
+    image: postgres:15
     container_name: superset_db
     restart: unless-stopped
     ports:
diff --git a/docs/docs/installation/configuring-superset.mdx b/docs/docs/installation/configuring-superset.mdx
index bfa1b91291..d69b95c9ac 100644
--- a/docs/docs/installation/configuring-superset.mdx
+++ b/docs/docs/installation/configuring-superset.mdx
@@ -103,10 +103,10 @@ database engine on a separate host or container.
 
 Superset supports the following database engines/versions:
 
-| Database Engine                                           | Supported Versions                |
-| --------------------------------------------------------- | --------------------------------- |
-| [PostgreSQL](https://www.postgresql.org/)                 | 10.X, 11.X, 12.X, 13.X, 14.X      |
-| [MySQL](https://www.mysql.com/)                           | 5.X                               |
+| Database Engine                                           | Supported Versions                 |
+| --------------------------------------------------------- | ---------------------------------- |
+| [PostgreSQL](https://www.postgresql.org/)                 | 10.X, 11.X, 12.X, 13.X, 14.X, 15.X |
+| [MySQL](https://www.mysql.com/)                           | 5.X                                |
 
 
 Use the following database drivers and connection strings: