Skip to content

Commit e87eb09

Browse files
authored
Updated ubuntu 24 image: added openblas (opencv#237)
* Updated ubuntu 24 image: added openblas * Restore GTK-3 * Restore ceres, restored image structure
1 parent adc72ef commit e87eb09

File tree

2 files changed

+40
-34
lines changed

2 files changed

+40
-34
lines changed

.github/workflows/OCV-PR-Linux.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -61,13 +61,13 @@ jobs:
6161
branch: ${{ fromJSON(needs.branch_eval.outputs.branches )}}
6262
include:
6363
- version: '24.04'
64-
image: '24.04:20241031'
64+
image: '24.04:20250329'
6565
jpegxl: true
6666
avif: true
6767
avx2: true
6868
# TODO: enable later
6969
# - version: '24.04_asan'
70-
# image: '24.04:20241031'
70+
# image: '24.04:20250329'
7171
# asan: true
7272
# jpegxl: true
7373
# avif: true

docker/ubuntu/Dockerfile-24

+38-32
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,58 @@
1-
# Version: 20241031
1+
# Version: 20250329
22
# Image name: quay.io/opencv-ci/opencv-ubuntu-24.04
33

44
FROM ubuntu:24.04
55

6+
ENV DEBIAN_FRONTEND=noninteractive
7+
68
RUN \
79
apt-get update && \
8-
DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
10+
apt-get install -y --no-install-recommends \
911
software-properties-common \
10-
curl zip unzip wget rsync mc nano time git file && \
11-
rm -rf /var/lib/apt/lists/*
12+
curl \
13+
zip \
14+
unzip \
15+
wget \
16+
rsync \
17+
mc \
18+
nano \
19+
time \
20+
git \
21+
file
1222

13-
# reportlab, svglib, pycairo: https://github.com/opencv/opencv/pull/23363
14-
# libavif: https://github.com/opencv/opencv/pull/23596
15-
# libjxl: https://github.com/opencv/opencv/pull/26379
1623
RUN \
1724
apt-get update && \
18-
DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
25+
apt-get install -y --no-install-recommends \
1926
cmake \
2027
build-essential \
2128
ccache \
2229
ninja-build \
30+
ant \
31+
ant-optional \
32+
default-jdk \
2333
python3-dev \
24-
python3-numpy \
2534
python3-setuptools \
2635
python3-pip \
27-
pylint \
2836
zlib1g-dev \
2937
libjpeg-dev \
3038
libpng-dev \
3139
libtiff5-dev \
3240
libopenjp2-7-dev \
3341
libavif-dev \
3442
libjxl-dev \
43+
libgtk-3-dev \
3544
libgtk-4-dev \
3645
libavcodec-dev \
3746
libavformat-dev \
3847
libswscale-dev \
39-
ant \
40-
ant-optional \
41-
default-jdk \
48+
libgstreamer1.0-dev \
49+
libgstreamer-plugins-base1.0-dev \
50+
gstreamer1.0-plugins-good \
51+
gstreamer1.0-plugins-ugly \
52+
gstreamer1.0-libav \
53+
libopenni2-dev \
54+
libdc1394-dev \
55+
libgphoto2-dev \
4256
hdf5-tools \
4357
libhdf5-dev \
4458
liblept5 \
@@ -48,27 +62,22 @@ RUN \
4862
libeigen3-dev \
4963
libsuitesparse-dev \
5064
liblapacke-dev \
51-
libceres-dev \
65+
libopenblas-dev \
5266
libeigen3-dev \
53-
libopenni2-dev \
5467
libglfw3-dev \
68+
libceres-dev \
5569
lcov \
5670
xvfb \
57-
pkg-config \
58-
&& \
59-
apt-get clean && \
60-
pip install --break-system-packages requests reportlab svglib pycairo rlPyCairo && pip cache purge
71+
pkg-config
6172

62-
RUN \
63-
apt-get update && \
64-
DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
65-
libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev \
66-
gstreamer1.0-plugins-good gstreamer1.0-plugins-ugly gstreamer1.0-libav \
67-
libopenni2-dev \
68-
libdc1394-dev \
69-
libgphoto2-dev \
70-
&& \
71-
rm -rf /var/lib/apt/lists/*
73+
RUN python3 -m pip install --break-system-packages \
74+
numpy \
75+
pylint \
76+
requests \
77+
reportlab \
78+
svglib \
79+
pycairo \
80+
rlPyCairo
7281

7382
# Self-hosted runner UID is 1000
7483

@@ -81,7 +90,4 @@ RUN \
8190
git config --global user.name "opencv.ci" && \
8291
git config --global pull.rebase false
8392

84-
# Run docker build from the root directory of the repository
85-
COPY scripts/warnings-handling.py /home/ubuntu/scripts/warnings-handling.py
86-
8793
CMD bash

0 commit comments

Comments
 (0)