Skip to content
This repository was archived by the owner on Mar 22, 2023. It is now read-only.

Commit a10ad3b

Browse files
Merge pull request #1050 from lukaszstolarczuk/fix-packages-deps
docker: fix packages deps
2 parents cf41956 + cd28a59 commit a10ad3b

7 files changed

Lines changed: 15 additions & 12 deletions

utils/docker/images/Dockerfile.fedora-32

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ ARG PMDK_DEPS="\
4242
man \
4343
ndctl-devel \
4444
pandoc \
45+
python3 \
4546
rpm-build \
4647
rpm-build-libs \
4748
rpmdevtools \
@@ -84,7 +85,6 @@ RUN dnf update -y \
8485
${EXAMPLES_DEPS} \
8586
${DOC_DEPS} \
8687
${TESTS_DEPS} \
87-
${COVERITY_DEPS} \
8888
${MISC_DEPS} \
8989
&& dnf clean all
9090

utils/docker/images/Dockerfile.fedora-33

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ ARG PMDK_DEPS="\
4242
man \
4343
ndctl-devel \
4444
pandoc \
45+
python3 \
4546
rpm-build \
4647
rpm-build-libs \
4748
rpmdevtools \
@@ -84,7 +85,6 @@ RUN dnf update -y \
8485
${EXAMPLES_DEPS} \
8586
${DOC_DEPS} \
8687
${TESTS_DEPS} \
87-
${COVERITY_DEPS} \
8888
${MISC_DEPS} \
8989
&& dnf clean all
9090

utils/docker/images/Dockerfile.fedora-rawhide

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,6 @@ ARG LIBPMEMOBJ_CPP_DEPS="\
3535
libpmemobj-devel \
3636
tbb-devel"
3737

38-
# pmem's Valgrind (optional; valgrind-devel may be used instead)
39-
ARG VALGRIND_DEPS="\
40-
autoconf \
41-
automake"
42-
4338
# Examples (optional)
4439
ARG EXAMPLES_DEPS="\
4540
ncurses-devel \
@@ -50,11 +45,14 @@ ARG DOC_DEPS="\
5045
doxygen"
5146

5247
# Tests (optional)
48+
# XXX: Valgrind is installed from upstream package, because of:
49+
# https://bugzilla.redhat.com/show_bug.cgi?id=1903527
5350
ARG TESTS_DEPS="\
5451
gdb \
5552
libpmem-devel \
5653
libunwind-devel \
57-
pmempool"
54+
pmempool \
55+
valgrind-devel"
5856

5957
# Misc for our builds/CI (optional)
6058
ARG MISC_DEPS="\

utils/docker/images/Dockerfile.ubuntu-18.04

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,8 @@ ARG PMDK_DEPS="\
5151
debhelper \
5252
devscripts \
5353
gdb \
54-
pandoc"
54+
pandoc \
55+
python3"
5556

5657
# pmem's Valgrind (optional; valgrind-devel may be used instead)
5758
ARG VALGRIND_DEPS="\

utils/docker/images/Dockerfile.ubuntu-20.04

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,8 @@ ARG PMDK_DEPS="\
4141
gdb \
4242
libdaxctl-dev \
4343
libndctl-dev \
44-
pandoc"
44+
pandoc \
45+
python3"
4546

4647
# pmem's Valgrind (optional; valgrind-devel may be used instead)
4748
ARG VALGRIND_DEPS="\
@@ -97,6 +98,7 @@ RUN apt-get update \
9798
${DOC_DEPS} \
9899
${TESTS_DEPS} \
99100
${CODECOV_DEPS} \
101+
${COVERITY_DEPS} \
100102
${MISC_DEPS} \
101103
&& rm -rf /var/lib/apt/lists/*
102104

utils/docker/images/Dockerfile.ubuntu-20.10

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,8 @@ ARG PMDK_DEPS="\
4141
gdb \
4242
libdaxctl-dev \
4343
libndctl-dev \
44-
pandoc"
44+
pandoc \
45+
python3"
4546

4647
# pmem's Valgrind (optional; valgrind-devel may be used instead)
4748
ARG VALGRIND_DEPS="\

utils/docker/images/Dockerfile.ubuntu-devel

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,8 @@ ARG PMDK_DEPS="\
4040
gdb \
4141
libdaxctl-dev \
4242
libndctl-dev \
43-
pandoc"
43+
pandoc \
44+
python3"
4445

4546
# pmem's Valgrind (optional; valgrind-devel may be used instead)
4647
ARG VALGRIND_DEPS="\

0 commit comments

Comments
 (0)