Backports Archive mirror
 help / color / mirror / Atom feed
From: Hauke Mehrtens <hauke@hauke-m.de>
To: backports@vger.kernel.org
Cc: Hauke Mehrtens <hauke@hauke-m.de>
Subject: [PATCH 4/4] CI: Use Ubuntu 24.04 as dev container base
Date: Mon,  1 Apr 2024 23:55:35 +0200	[thread overview]
Message-ID: <20240401215535.2432969-4-hauke@hauke-m.de> (raw)
In-Reply-To: <20240401215535.2432969-1-hauke@hauke-m.de>

Use Ubuntu 24.04 as the base for the dev container. The Ubuntu PPA
kernel in version 5.19 or higher are not compiling with Ubuntu 22.04
any more. They need GCC version 12 or higher.

This removes the pip installation and uses zstandard from the Ubuntu
package repository instead.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
 .devcontainer/Dockerfile | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index f758c9cb..cdf5d124 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -1,11 +1,9 @@
-FROM ubuntu:22.04
+FROM ubuntu:24.04
 
 RUN apt update && \
-	apt install -y git coccinelle build-essential python3 python3-pip python-is-python3 flex bison libelf1 libelf-dev && \
+	apt install -y git coccinelle build-essential python3 python3-zstandard python-is-python3 flex bison libelf1 libelf-dev && \
 	rm -rf /var/lib/apt/lists/*
 
-RUN pip install pyzstd zstandard
-
 RUN git clone https://github.com/hauke/backports.git
 
 RUN /backports/devel/backports-update-manager --yes --no-git-update && \
-- 
2.44.0


      parent reply	other threads:[~2024-04-01 21:56 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-04-01 21:55 [PATCH 1/4] CI: Add libelf-dev to dev container Hauke Mehrtens
2024-04-01 21:55 ` [PATCH 2/4] backports-update-manager: Install only kernel 4.0 and higher Hauke Mehrtens
2024-04-01 21:55 ` [PATCH 3/4] backports-update-manager: Use zstandard from pip Hauke Mehrtens
2024-04-01 21:55 ` Hauke Mehrtens [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240401215535.2432969-4-hauke@hauke-m.de \
    --to=hauke@hauke-m.de \
    --cc=backports@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).