Merge pull request #8 from lukaszstolarczuk/update-dockers-2

Update dockers 2

Author: lukaszstolarczuk

docker/images/fedora-33.Dockerfile

@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: BSD-3-Clause
-# Copyright 2016-2021, Intel Corporation
+# Copyright 2016-2022, Intel Corporation
 
 #
 # Dockerfile - Base image for PMDK related projects.
@@ -22,7 +22,7 @@ ARG BASE_DEPS="\
 	git \
 	make"
 
-# PMDK's dependencies (optional; libpmemobj-devel package may be used instead)
+# PMDK's dependencies (optional; libpmem*-devel packages may be used instead)
 ARG PMDK_DEPS="\
 	autoconf \
 	automake \
@@ -36,6 +36,11 @@ ARG PMDK_DEPS="\
 	rpmdevtools \
 	which"
 
+# libpmemobj-cpp's dependencies (optional; libpmemobj++-devel package may be used instead)
+ARG LIBPMEMOBJ_CPP_DEPS="\
+	libatomic \
+	tbb-devel"
+
 # pmem's Valgrind (optional; valgrind-devel may be used instead)
 ARG VALGRIND_DEPS="\
 	autoconf \
@@ -60,10 +65,6 @@ ARG MISC_DEPS="\
 	pkgconf \
 	sudo"
 
-# Coverity
-ENV COVERITY_DEPS "\
-	wget"
-
 # Update packages and install basic tools
 RUN dnf update -y \
  && dnf install -y \
@@ -73,7 +74,6 @@ RUN dnf update -y \
 	${DOC_DEPS} \
 	${TESTS_DEPS} \
 	${MISC_DEPS} \
-	${COVERITY_DEPS} \
  && dnf debuginfo-install -y glibc \
  && dnf clean all
 

docker/images/fedora-34.Dockerfile

@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: BSD-3-Clause
-# Copyright 2016-2021, Intel Corporation
+# Copyright 2016-2022, Intel Corporation
 
 #
 # Dockerfile - Base image for PMDK related projects.
@@ -22,7 +22,7 @@ ARG BASE_DEPS="\
 	git \
 	make"
 
-# PMDK's dependencies (optional; libpmemobj-devel package may be used instead)
+# PMDK's dependencies (optional; libpmem*-devel packages may be used instead)
 ARG PMDK_DEPS="\
 	autoconf \
 	automake \
@@ -36,6 +36,11 @@ ARG PMDK_DEPS="\
 	rpmdevtools \
 	which"
 
+# libpmemobj-cpp's dependencies (optional; libpmemobj++-devel package may be used instead)
+ARG LIBPMEMOBJ_CPP_DEPS="\
+	libatomic \
+	tbb-devel"
+
 # pmem's Valgrind (optional; valgrind-devel may be used instead)
 ARG VALGRIND_DEPS="\
 	autoconf \
@@ -60,10 +65,6 @@ ARG MISC_DEPS="\
 	pkgconf \
 	sudo"
 
-# Coverity
-ENV COVERITY_DEPS "\
-	wget"
-
 # Update packages and install basic tools
 RUN dnf update -y \
  && dnf install -y \
@@ -73,7 +74,6 @@ RUN dnf update -y \
 	${DOC_DEPS} \
 	${TESTS_DEPS} \
 	${MISC_DEPS} \
-	${COVERITY_DEPS} \
  && dnf debuginfo-install -y glibc \
  && dnf clean all
 

docker/images/fedora-35.Dockerfile

@@ -22,7 +22,7 @@ ARG BASE_DEPS="\
 	git \
 	make"
 
-# PMDK's dependencies (optional; libpmemobj-devel package may be used instead)
+# PMDK's dependencies (optional; libpmem*-devel packages may be used instead)
 ARG PMDK_DEPS="\
 	autoconf \
 	automake \
@@ -36,6 +36,11 @@ ARG PMDK_DEPS="\
 	rpmdevtools \
 	which"
 
+# libpmemobj-cpp's dependencies (optional; libpmemobj++-devel package may be used instead)
+ARG LIBPMEMOBJ_CPP_DEPS="\
+	libatomic \
+	tbb-devel"
+
 # pmem's Valgrind (optional; valgrind-devel may be used instead)
 ARG VALGRIND_DEPS="\
 	autoconf \
@@ -60,10 +65,6 @@ ARG MISC_DEPS="\
 	pkgconf \
 	sudo"
 
-# Coverity
-ENV COVERITY_DEPS "\
-	wget"
-
 # Update packages and install basic tools
 RUN dnf update -y \
  && dnf install -y \
@@ -73,7 +74,6 @@ RUN dnf update -y \
 	${DOC_DEPS} \
 	${TESTS_DEPS} \
 	${MISC_DEPS} \
-	${COVERITY_DEPS} \
  && dnf debuginfo-install -y glibc \
  && dnf clean all
 

docker/images/ubuntu-20.04.Dockerfile

@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: BSD-3-Clause
-# Copyright 2016-2021, Intel Corporation
+# Copyright 2016-2022, Intel Corporation
 
 #
 # Dockerfile - Base image for PMDK related projects.
@@ -21,7 +21,7 @@ ARG BASE_DEPS="\
 	cmake \
 	git"
 
-# PMDK's dependencies (optional; libpmemobj-devel package may be used instead)
+# PMDK's dependencies (optional; libpmem*-dev packages may be used instead)
 ARG PMDK_DEPS="\
 	autoconf \
 	automake \
@@ -33,7 +33,12 @@ ARG PMDK_DEPS="\
 	pandoc \
 	python3"
 
-# pmem's Valgrind (optional; valgrind-devel may be used instead)
+# libpmemobj-cpp's dependencies (optional; libpmemobj-cpp-dev package may be used instead)
+ARG LIBPMEMOBJ_CPP_DEPS="\
+	libatomic1 \
+	libtbb-dev"
+
+# pmem's Valgrind (optional; valgrind may be used instead)
 ARG VALGRIND_DEPS="\
 	autoconf \
 	automake"
@@ -44,9 +49,9 @@ ARG DOC_DEPS="\
 	pandoc"
 
 # Tests (optional)
-# NOTE: glibc is installed as a separate command; see below
 ARG TESTS_DEPS="\
 	gdb \
+	libc6-dbg \
 	libunwind-dev"
 
 # Misc for our builds/CI (optional)

docker/images/ubuntu-21.04.Dockerfile

@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: BSD-3-Clause
-# Copyright 2016-2021, Intel Corporation
+# Copyright 2016-2022, Intel Corporation
 
 #
 # Dockerfile - Base image for PMDK related projects.
@@ -21,7 +21,7 @@ ARG BASE_DEPS="\
 	cmake \
 	git"
 
-# PMDK's dependencies (optional; libpmemobj-devel package may be used instead)
+# PMDK's dependencies (optional; libpmem*-dev packages may be used instead)
 ARG PMDK_DEPS="\
 	autoconf \
 	automake \
@@ -33,7 +33,12 @@ ARG PMDK_DEPS="\
 	pandoc \
 	python3"
 
-# pmem's Valgrind (optional; valgrind-devel may be used instead)
+# libpmemobj-cpp's dependencies (optional; libpmemobj-cpp-dev package may be used instead)
+ARG LIBPMEMOBJ_CPP_DEPS="\
+	libatomic1 \
+	libtbb-dev"
+
+# pmem's Valgrind (optional; valgrind may be used instead)
 ARG VALGRIND_DEPS="\
 	autoconf \
 	automake"
@@ -44,9 +49,9 @@ ARG DOC_DEPS="\
 	pandoc"
 
 # Tests (optional)
-# NOTE: glibc is installed as a separate command; see below
 ARG TESTS_DEPS="\
 	gdb \
+	libc6-dbg \
 	libunwind-dev"
 
 # Misc for our builds/CI (optional)
@@ -57,12 +62,6 @@ ARG MISC_DEPS="\
 	sudo \
 	whois"
 
-# Coverity
-ENV COVERITY_DEPS "\
-	curl \
-	ruby \
-	wget"
-
 ENV DEBIAN_FRONTEND noninteractive
 
 # Update packages and install basic tools
@@ -74,7 +73,6 @@ RUN apt-get update \
 	${DOC_DEPS} \
 	${TESTS_DEPS} \
 	${MISC_DEPS} \
-	${COVERITY_DEPS} \
  && rm -rf /var/lib/apt/lists/* \
  && apt-get clean all
 

docker/images/ubuntu-21.10.Dockerfile

@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: BSD-3-Clause
-# Copyright 2016-2021, Intel Corporation
+# Copyright 2016-2022, Intel Corporation
 
 #
 # Dockerfile - Base image for PMDK related projects.
@@ -21,7 +21,7 @@ ARG BASE_DEPS="\
 	cmake \
 	git"
 
-# PMDK's dependencies (optional; libpmemobj-devel package may be used instead)
+# PMDK's dependencies (optional; libpmem*-dev packages may be used instead)
 ARG PMDK_DEPS="\
 	autoconf \
 	automake \
@@ -33,7 +33,12 @@ ARG PMDK_DEPS="\
 	pandoc \
 	python3"
 
-# pmem's Valgrind (optional; valgrind-devel may be used instead)
+# libpmemobj-cpp's dependencies (optional; libpmemobj-cpp-dev package may be used instead)
+ARG LIBPMEMOBJ_CPP_DEPS="\
+	libatomic1 \
+	libtbb-dev"
+
+# pmem's Valgrind (optional; valgrind may be used instead)
 ARG VALGRIND_DEPS="\
 	autoconf \
 	automake"
@@ -44,9 +49,9 @@ ARG DOC_DEPS="\
 	pandoc"
 
 # Tests (optional)
-# NOTE: glibc is installed as a separate command; see below
 ARG TESTS_DEPS="\
 	gdb \
+	libc6-dbg \
 	libunwind-dev"
 
 # Misc for our builds/CI (optional)
@@ -57,12 +62,6 @@ ARG MISC_DEPS="\
 	sudo \
 	whois"
 
-# Coverity
-ENV COVERITY_DEPS "\
-	curl \
-	ruby \
-	wget"
-
 ENV DEBIAN_FRONTEND noninteractive
 
 # Update packages and install basic tools
@@ -74,7 +73,6 @@ RUN apt-get update \
 	${DOC_DEPS} \
 	${TESTS_DEPS} \
 	${MISC_DEPS} \
-	${COVERITY_DEPS} \
  && rm -rf /var/lib/apt/lists/* \
  && apt-get clean all