From: Michael Albinus <michael.albinus@gmx.de>
Date: Sat, 25 Mar 2023 17:29:25 +0000 (+0100)
Subject: * test/infra/Dockerfile.emba (emacs-eglot): Adapt software selection.
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e2ff4dbf3db5d3eae463660651753a127620fbe8;p=emacs.git

* test/infra/Dockerfile.emba (emacs-eglot): Adapt software selection.
---

diff --git a/test/infra/Dockerfile.emba b/test/infra/Dockerfile.emba
index 5b14384ceb3..520fcb7e15e 100644
--- a/test/infra/Dockerfile.emba
+++ b/test/infra/Dockerfile.emba
@@ -64,11 +64,17 @@ FROM emacs-base as emacs-eglot
 
 RUN apt-get update && \
     apt-get install -y --no-install-recommends -o=Dpkg::Use-Pty=0 \
-      wget \
+      snapd wget \
     && rm -rf /var/lib/apt/lists/*
 
-# We install a recent clangd for Eglot tests.
-RUN bash -c "$(wget -O - https://apt.llvm.org/llvm.sh)"
+# A recent clangd.  It must be at least clangd 14, which is in Debian
+# bookworm.
+RUN bash -c "$(wget --no-check-certificate -O - https://apt.llvm.org/llvm.sh)"
+
+# A recent pylsp.  Since Debian bookworm there is the package
+# python3-pylsp.
+RUN snap install core
+RUN snap install pylsp
 
 COPY . /checkout
 WORKDIR /checkout