From 39f38057c2b69cb7b14a2876829262b893565d2d Mon Sep 17 00:00:00 2001
From: Shay <hillerys@element.io>
Date: Fri, 7 Jan 2022 09:09:12 -0800
Subject: [PATCH] Drop bionic from docker builds and add focal (#1181)

* build focal image

* remove bionic and test with focal

* update docs to reflect building and testing of focal vs bionic

* fix incorrect python version
---
 .github/workflows/docker.yml   |  8 ++++----
 .github/workflows/pipeline.yml | 12 ++++++------
 docker/README.md               |  4 ++--
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index cff84c712..f94f5e816 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -17,8 +17,8 @@ jobs:
     strategy:
       matrix:
         include:
-          - base_image: ubuntu:bionic
-            tag: bionic
+          - base_image: ubuntu:focal
+            tag: focal
           - base_image: debian:buster
             tag: buster
           - base_image: debian:testing
@@ -54,9 +54,9 @@ jobs:
     strategy:
       matrix:
         include:
-          - sytest_image_tag: bionic
+          - sytest_image_tag: focal
             dockerfile: synapse
-            tags: "matrixdotorg/sytest-synapse:bionic"
+            tags: "matrixdotorg/sytest-synapse:focal"
           - sytest_image_tag: buster
             dockerfile: synapse
             tags: "matrixdotorg/sytest-synapse:buster"
diff --git a/.github/workflows/pipeline.yml b/.github/workflows/pipeline.yml
index 4b9ebe0df..6bdcec10b 100644
--- a/.github/workflows/pipeline.yml
+++ b/.github/workflows/pipeline.yml
@@ -20,15 +20,15 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - label: Py 3.6, SQLite 3.22.0, Monolith
-            sytest-tag: bionic
+          - label: Py 3.8, SQLite 3.31.1, Monolith
+            sytest-tag: focal
 
-          - label: Py 3.6, PG 10, Monolith
-            sytest-tag: bionic
+          - label: Py 3.8, PG 12, Monolith
+            sytest-tag: focal
             postgres: postgres
 
-          - label: Py 3.6, PG 10, Workers
-            sytest-tag: bionic
+          - label: Py 3.8, PG 12, Workers
+            sytest-tag: focal
             postgres: postgres
             workers: workers
 
diff --git a/docker/README.md b/docker/README.md
index c4476384f..ea7a4c2ff 100644
--- a/docker/README.md
+++ b/docker/README.md
@@ -8,9 +8,9 @@ but its dependencies are.
 Included currently is:
 
 - `matrixdotorg/sytest` Base container with SyTest dependencies installed
-    - Tagged by underlying Debian/Ubuntu image: `bionic`, `buster` or `testing`
+    - Tagged by underlying Debian/Ubuntu image: `focal`, `buster` or `testing`
 - `matrixdotorg/sytest-synapse`: Runs SyTest against Synapse
-    - Tagged by underlying Debian/Ubunutu image: `bionic`, `buster` or `testing`
+    - Tagged by underlying Debian/Ubunutu image: `focal`, `buster` or `testing`
 - `matrixdotorg/sytest-dendrite:go113`: Runs SyTest against Dendrite on Go 1.13
     - Currently uses Debian 10 (Buster) as its base image