1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
|
From 57e27fe9f716c9da79823731dcde085430cbc545 Mon Sep 17 00:00:00 2001
From: Boris Staletic <boris.staletic@protonmail.com>
Date: Wed, 28 Aug 2024 22:11:33 +0200
Subject: [PATCH] Update Docker image
---
test/docker/ci/image/Dockerfile | 18 ++++++------------
1 file changed, 6 insertions(+), 12 deletions(-)
diff --git a/test/docker/ci/image/Dockerfile b/test/docker/ci/image/Dockerfile
index 992f23d6..1ccdc2a9 100644
--- a/test/docker/ci/image/Dockerfile
+++ b/test/docker/ci/image/Dockerfile
@@ -1,34 +1,31 @@
-FROM ubuntu:22.04
+FROM ubuntu:24.04
ENV DEBIAN_FRONTEND=noninteractive
ENV LC_ALL C.UTF-8
-ARG VIM_VERSION=v9.0.0214
+ARG VIM_VERSION=v9.1.0016
ARG YCM_VIM_PYTHON=python3
ARG NODE_MAJOR=18
RUN apt-get update && \
apt-get -y dist-upgrade && \
- apt-get -y --no-install-recommends install ca-cacert \
+ apt-get -y --no-install-recommends install \
gnupg \
locales \
tzdata \
language-pack-en \
- curl \
sudo \
- libncurses5-dev libncursesw5-dev && \
- mkdir -p /etc/apt/keyrings && \
- curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg && \
- echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_$NODE_MAJOR.x nodistro main" > /etc/apt/sources.list.d/nodesource.list && \
- apt-get update && apt-get -y upgrade && apt-get -y --no-install-recommends install \
+ libncurses5-dev libncursesw5-dev \
git \
build-essential \
cmake \
python3-dev \
python3-pip \
python3-setuptools \
+ python3-wheel \
openjdk-11-jdk-headless \
nodejs \
+ npm \
vim-nox \
zlib1g-dev && \
apt-get -y autoremove
@@ -50,9 +47,6 @@ RUN mkdir -p $HOME/vim && \
make -j 4 && \
make install
-# Python
-RUN ${YCM_VIM_PYTHON} -m pip install --upgrade pip setuptools wheel
-
# clean up
RUN rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* &&\
rm -rf ~/.cache && \
--
2.45.2
|
