40 lines
1.3 KiB
Diff
40 lines
1.3 KiB
Diff
|
From c87ecc7f26a0a0034a8bf49691f572fe1d4fed29 Mon Sep 17 00:00:00 2001
|
||
|
|
From: haozi007 <liuhao27@huawei.com>
|
||
|
|
Date: Wed, 22 Nov 2023 15:00:24 +0800
|
||
|
|
Subject: [PATCH 26/64] [CI] add ncurse for ubuntu and centos
|
||
|
|
|
||
|
|
Signed-off-by: haozi007 <liuhao27@huawei.com>
|
||
|
|
---
|
||
|
|
CI/dockerfiles/Dockerfile-centos | 2 ++
|
||
|
|
CI/dockerfiles/Dockerfile-ubuntu | 2 +-
|
||
|
|
2 files changed, 3 insertions(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/CI/dockerfiles/Dockerfile-centos b/CI/dockerfiles/Dockerfile-centos
|
||
|
|
index 7250b7bd..1d76b4ec 100644
|
||
|
|
--- a/CI/dockerfiles/Dockerfile-centos
|
||
|
|
+++ b/CI/dockerfiles/Dockerfile-centos
|
||
|
|
@@ -299,5 +299,7 @@ RUN export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig:$PKG_CONFIG_PATH && \
|
||
|
|
make install && \
|
||
|
|
ldconfig
|
||
|
|
|
||
|
|
+RUN dnf install -y ncurses-devel && dnf clean all
|
||
|
|
+
|
||
|
|
VOLUME [ "/sys/fs/cgroup" ]
|
||
|
|
CMD ["/usr/sbin/init"]
|
||
|
|
diff --git a/CI/dockerfiles/Dockerfile-ubuntu b/CI/dockerfiles/Dockerfile-ubuntu
|
||
|
|
index f84ae0a7..2441a7ce 100644
|
||
|
|
--- a/CI/dockerfiles/Dockerfile-ubuntu
|
||
|
|
+++ b/CI/dockerfiles/Dockerfile-ubuntu
|
||
|
|
@@ -84,7 +84,7 @@ RUN apt update -y && apt upgrade -y && \
|
||
|
|
patch \
|
||
|
|
tcpdump
|
||
|
|
|
||
|
|
-RUN apt autoremove -y
|
||
|
|
+RUN apt install -y libncurses-dev && apt autoremove -y
|
||
|
|
RUN pip3 install meson ninja
|
||
|
|
|
||
|
|
RUN echo "export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig:$PKG_CONFIG_PATH" >> /etc/bashrc && \
|
||
|
|
--
|
||
|
|
2.42.0
|
||
|
|
|