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

docker: fix packages deps #1050

Merged
lukaszstolarczuk merged 3 commits into from
Feb 24, 2021
Merged

docker: fix packages deps #1050

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d1b9624
docker: add python3 package as PMDK dependency
lukaszstolarczuk Feb 24, 2021
ad7094e
docker: Coverity dependency is required on Ubuntu 20.04 not Fedora's
lukaszstolarczuk Feb 24, 2021
cd28a59
docker: install valgrind from an upstream package on Fedora Rawhide
lukaszstolarczuk Feb 24, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion utils/docker/images/Dockerfile.fedora-32
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ ARG PMDK_DEPS="\
man \
ndctl-devel \
pandoc \
python3 \
rpm-build \
rpm-build-libs \
rpmdevtools \
Expand Down Expand Up @@ -84,7 +85,6 @@ RUN dnf update -y \
${EXAMPLES_DEPS} \
${DOC_DEPS} \
${TESTS_DEPS} \
${COVERITY_DEPS} \
${MISC_DEPS} \
&& dnf clean all

Expand Down
2 changes: 1 addition & 1 deletion utils/docker/images/Dockerfile.fedora-33
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ ARG PMDK_DEPS="\
man \
ndctl-devel \
pandoc \
python3 \
rpm-build \
rpm-build-libs \
rpmdevtools \
Expand Down Expand Up @@ -84,7 +85,6 @@ RUN dnf update -y \
${EXAMPLES_DEPS} \
${DOC_DEPS} \
${TESTS_DEPS} \
${COVERITY_DEPS} \
${MISC_DEPS} \
&& dnf clean all

Expand Down
10 changes: 4 additions & 6 deletions utils/docker/images/Dockerfile.fedora-rawhide
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,6 @@ ARG LIBPMEMOBJ_CPP_DEPS="\
libpmemobj-devel \
tbb-devel"

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

# Examples (optional)
ARG EXAMPLES_DEPS="\
ncurses-devel \
Expand All @@ -50,11 +45,14 @@ ARG DOC_DEPS="\
doxygen"

# Tests (optional)
# XXX: Valgrind is installed from upstream package, because of:
# https://bugzilla.redhat.com/show_bug.cgi?id=1903527
ARG TESTS_DEPS="\
gdb \
libpmem-devel \
libunwind-devel \
pmempool"
pmempool \
valgrind-devel"

# Misc for our builds/CI (optional)
ARG MISC_DEPS="\
Expand Down
3 changes: 2 additions & 1 deletion utils/docker/images/Dockerfile.ubuntu-18.04
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,8 @@ ARG PMDK_DEPS="\
debhelper \
devscripts \
gdb \
pandoc"
pandoc \
python3"

# pmem's Valgrind (optional; valgrind-devel may be used instead)
ARG VALGRIND_DEPS="\
Expand Down
4 changes: 3 additions & 1 deletion utils/docker/images/Dockerfile.ubuntu-20.04
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,8 @@ ARG PMDK_DEPS="\
gdb \
libdaxctl-dev \
libndctl-dev \
pandoc"
pandoc \
python3"

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

Expand Down
3 changes: 2 additions & 1 deletion utils/docker/images/Dockerfile.ubuntu-20.10
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,8 @@ ARG PMDK_DEPS="\
gdb \
libdaxctl-dev \
libndctl-dev \
pandoc"
pandoc \
python3"

# pmem's Valgrind (optional; valgrind-devel may be used instead)
ARG VALGRIND_DEPS="\
Expand Down
3 changes: 2 additions & 1 deletion utils/docker/images/Dockerfile.ubuntu-devel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,8 @@ ARG PMDK_DEPS="\
gdb \
libdaxctl-dev \
libndctl-dev \
pandoc"
pandoc \
python3"

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