Skip to content

Commit 7e0007d

Browse files
committed
python: fix Dockerfile
1 parent 0657a1c commit 7e0007d

File tree

1 file changed

+22
-24
lines changed

1 file changed

+22
-24
lines changed

python/Dockerfile

+22-24
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,41 @@
1-
FROM quay.io/pypa/manylinux2014_x86_64:2021-07-25-cfe8a6c
1+
FROM quay.io/pypa/manylinux2014_x86_64:latest@sha256:de0a3338f5564eb9b3645122e4c12eb4f64d63f0ce6867c9cb8e96f75eb95c5b
22

3-
# install clang
4-
RUN yum -y install clang
3+
# install libclang 7.0
4+
RUN yum -y install llvm-toolset-7.0-clang llvm-toolset-7.0-clang-devel
55

66
# Xen
77
# Note: the first sed disables a compiler flag that would be treated as an error
88
# the second sed disabled the compilation of qemu, which is very long and also
99
# had errors, and we don't need it anyway
10-
RUN git clone -b RELEASE-4.11.0 --depth 1 https://github.com/xen-project/xen \
10+
RUN git clone -b RELEASE-4.19.0 --depth 1 https://github.com/xen-project/xen \
1111
&& cd xen \
12-
&& yum install -y dev86 xz-devel python-devel gettext-devel iasl \
13-
ncurses-devel pixman-devel wget yajl-devel zlib-devel \
14-
glibc-devel.i686 libuuid-devel \
12+
&& yum install -y flex ninja-build dev86 xz-devel python3-devel gettext-devel iasl \
13+
ncurses-devel pixman-devel wget yajl-devel zlib-devel \
14+
glibc-devel.i686 libuuid-devel \
1515
&& ./configure --disable-xen --disable-docs --disable-stubdom \
16-
--enable-tools --disable-rombios \
17-
&& sed -i '/$(call cc-option-add,CFLAGS,CC,-Wno-unused-local-typedefs)/a $(call cc-option-add,CFLAGS,CC,-Wno-address-of-packed-member)' Config.mk \
18-
&& sed -i 28,32d tools/Makefile \
16+
--enable-tools --disable-rombios \
1917
&& make -j4 dist-tools \
2018
&& make install-tools \
2119
&& cd .. \
2220
&& rm -rf xen
2321

2422
# libkvmi v7
2523
RUN git clone https://github.com/bitdefender/libkvmi.git \
26-
&& cd libkvmi \
27-
&& git checkout bf5776319e1801b59125c994c459446f0ed6837e \
28-
&& ./bootstrap \
29-
&& ./configure \
30-
&& make \
31-
&& make install \
32-
&& cd .. \
33-
&& rm -rf libkvmi
24+
&& cd libkvmi \
25+
&& git checkout bf5776319e1801b59125c994c459446f0ed6837e \
26+
&& ./bootstrap \
27+
&& ./configure \
28+
&& make \
29+
&& make install \
30+
&& cd .. \
31+
&& rm -rf libkvmi
3432

3533
# libFDP.so
3634
RUN git clone --depth 1 https://github.com/thalium/icebox \
37-
&& cd icebox/src/FDP \
38-
&& g++ -std=c++11 -shared -fPIC FDP.cpp -o libFDP.so -lrt \
39-
&& mv include/* /usr/local/include/ \
40-
&& mv libFDP.so /usr/local/lib/ \
41-
&& cd - \
42-
&& rm -rf icebox
35+
&& cd icebox/src/FDP \
36+
&& g++ -std=c++11 -shared -fPIC FDP.cpp -o libFDP.so -lrt \
37+
&& mv include/* /usr/local/include/ \
38+
&& mv libFDP.so /usr/local/lib/ \
39+
&& cd - \
40+
&& rm -rf icebox
4341

0 commit comments

Comments
 (0)