Browse Source

Update Docker image

Boris Staletic 6 months ago
parent
commit
57e27fe9f7
1 changed files with 6 additions and 12 deletions
  1. 6 12
      test/docker/ci/image/Dockerfile

+ 6 - 12
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 && \