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.

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

Support newer Debian releases #70

Merged
merged 2 commits into from
Jan 19, 2021
Merged

Support newer Debian releases #70

merged 2 commits into from
Jan 19, 2021

Conversation

gbp
Copy link
Member

@gbp gbp commented Jul 3, 2020

We're looking at the possibility of dropping Ruby 2.3 support in Alaveteli [1] but need to support a newer version of Debian which has a later so this allows us to build Buster images without getting a unsupported distribution and version combination error.

[1] mysociety/alaveteli#5222

@gbp gbp requested review from dracos and garethrees July 3, 2020 14:36
Copy link
Member

@garethrees garethrees left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we want to keep contrib support, but would also be worth @sagepe reviewing this.

bin/install-site.sh Show resolved Hide resolved
bin/install-site.sh Show resolved Hide resolved
Copy link
Member

@dracos dracos left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

From a FMS/TWFY/mapit point of view, I don't think any of them use contrib/non-free, so happy to have them go and get buster etc support.
One thing to consider in the "Support newer Debian" commit is update_mysociety_apt_sources - this is stretch on stretch/X-A ubuntu, jessie on jessie, wheezy on anything else. I think the only thing TWFY uses is php7-xapian which is only in stretch, perhaps this should be changed to just only use stretch and drop the jessie/wheezy parts? @sagepe can probably answer better on that.

@sagepe
Copy link
Member

sagepe commented Jan 6, 2021

Looking through this, I'm inclined to make a set of changes - I've already got these drafted locally, I'll tidy them up and add another commit shortly for review, but essentially these will:

  • remove support for anything before Stretch and Xenial
  • only support Ubuntu LTS variants and map these to the associated Debian release for our the mySociety repo
  • Keep contrib and non-free for all Debian releases
  • Add buster support, including for our internal repo (which has an initial set of packages via https://github.com/mysociety/sysadmin/issues/1342)

Feel free to shout now if there's anything hugely controversial there, or wait until the commit is finalised - I'm intending to get this tested locally today, but wanted to outline my thoughts in case it gets delayed.

@sagepe sagepe force-pushed the support-newer-debian branch from fb49bd3 to fa7cea6 Compare January 6, 2021 14:24
@sagepe
Copy link
Member

sagepe commented Jan 7, 2021

So, if everyone is happy with the final form of this, let me know - I'm happy to just squash this all together into a single commit.

@gbp
Copy link
Member Author

gbp commented Jan 7, 2021

So, if everyone is happy with the final form of this, let me know - I'm happy to just squash this all together into a single commit.

Can't approve my own PR but yes this as a squashed commit looks fine to me.

This removes support for everything before Xenial and Stretch and adds
support up to Focal and Buster.

It should be noted that the mySociety repository only has formal support
for Debian and not Ubuntu, so each Ubuntu release is currently mapped to
the closest available Debian version, which may work for at least some
packages.

This also refactors the repository sections slightly, templating them
based on the specific versions in question to reduce duplication.
@sagepe sagepe force-pushed the support-newer-debian branch from 886da59 to e6eb814 Compare January 8, 2021 08:37
@sagepe sagepe requested a review from dracos January 8, 2021 08:37
@sagepe sagepe self-assigned this Jan 8, 2021
We've now added explicit support for Xenial, Bionic and Focal to our
repository, so this reflects that.
@sagepe
Copy link
Member

sagepe commented Jan 14, 2021

I've added a further commit that creates Ubuntu-specific versions of the mySociety repo now that we're supporting those, too.

@sagepe sagepe merged commit 02fa755 into master Jan 19, 2021
@sagepe sagepe deleted the support-newer-debian branch January 19, 2021 08:28
@dracos dracos mentioned this pull request May 4, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants