Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Drop bionic from docker builds and add focal #1181

Merged
merged 5 commits into from
Jan 7, 2022
Merged

Drop bionic from docker builds and add focal #1181

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9dc65e4
build focal image
H-Shay Dec 21, 2021
c016963
remove bionic and test with focal
H-Shay Dec 21, 2021
75cf791
update docs to reflect building and testing of focal vs bionic
H-Shay Dec 21, 2021
3e88ca9
fix incorrect python version
H-Shay Dec 21, 2021
e625f7a
Merge branch 'develop' into shay/add_focal
H-Shay Jan 5, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/docker.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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"
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/pipeline.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions docker/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down