docker: cleanup packages in Fedora and Ubuntu images

Author: lukaszstolarczuk

utils/docker/images/Dockerfile.fedora-32

@@ -20,47 +20,85 @@ ENV NOTTY 1
 ARG SKIP_VALGRIND_BUILD
 ARG SKIP_PMDK_BUILD
 
-# Install basic tools
-RUN dnf update -y \
- && dnf install -y \
-	asciidoc \
-	autoconf \
-	automake \
-	bash-completion \
-	clang \
+# Base development packages
+ARG BASE_DEPS="\
 	cmake \
-	daxctl-devel \
-	doxygen \
 	gcc \
 	gcc-c++ \
-	gdb \
 	git \
-	hub \
-	json-c-devel \
-	kmod-devel \
+	make"
+
+# Dependencies for compiling libpmemobj-cpp project
+ARG LIBPMEMOBJ_CPP_DEPS="\
 	libatomic \
-	libtool \
-	libudev-devel \
-	libunwind-devel \
-	libuuid-devel \
-	make \
+	tbb-devel"
+
+# PMDK's dependencies (optional; libpmemobj-devel package may be used instead)
+ARG PMDK_DEPS="\
+	autoconf \
+	automake \
+	daxctl-devel \
+	gdb \
 	man \
-	ncurses-devel \
 	ndctl-devel \
-	open-sans-fonts \
 	pandoc \
-	passwd \
-	perl-Text-Diff \
 	rpm-build \
 	rpm-build-libs \
 	rpmdevtools \
-	SFML-devel \
-	sudo \
+	which"
+
+# pmem's Valgrind (optional; valgrind-devel may be used instead)
+ARG VALGRIND_DEPS="\
+	autoconf \
+	automake"
+
+# Examples (optional)
+ARG EXAMPLES_DEPS="\
+	ncurses-devel \
+	SFML-devel"
+
+# Documentation (optional)
+ARG DOC_DEPS="\
+	doxygen"
+
+# Tests (optional)
+ARG TESTS_DEPS="\
+	gdb \
+	libunwind-devel"
+
+# Misc for our builds/CI (optional)
+ARG MISC_DEPS="\
+	clang \
+	hub \
+	perl-Text-Diff \
+	pkgconf \
+	sudo"
+
+ARG REDUNDANT_DEPS="\
+	bash-completion \
+	open-sans-fonts \
+	passwd \
 	tar \
-	tbb-devel \
-	wget \
-	which \
 	xmlto \
+	asciidoc \
+	json-c-devel \
+	kmod-devel \
+	libtool \
+	libudev-devel \
+	libuuid-devel"
+
+# Update packages and install basic tools
+RUN dnf update -y \
+ && dnf install -y \
+	${BASE_DEPS} \
+	${LIBPMEMOBJ_CPP_DEPS} \
+	${PMDK_DEPS} \
+	${VALGRIND_DEPS} \
+	${EXAMPLES_DEPS} \
+	${DOC_DEPS} \
+	${TESTS_DEPS} \
+	${COVERITY_DEPS} \
+	${MISC_DEPS} \
  && dnf clean all
 
 # Install valgrind

utils/docker/images/Dockerfile.fedora-33

@@ -20,47 +20,86 @@ ENV NOTTY 1
 ARG SKIP_VALGRIND_BUILD
 ARG SKIP_PMDK_BUILD
 
-# Install basic tools
-RUN dnf update -y \
- && dnf install -y \
-	asciidoc \
-	autoconf \
-	automake \
-	bash-completion \
-	clang \
+# Base development packages
+ARG BASE_DEPS="\
 	cmake \
-	daxctl-devel \
-	doxygen \
 	gcc \
 	gcc-c++ \
-	gdb \
 	git \
-	hub \
-	json-c-devel \
-	kmod-devel \
+	make"
+
+# Dependencies for compiling libpmemobj-cpp project
+ARG LIBPMEMOBJ_CPP_DEPS="\
 	libatomic \
-	libtool \
-	libudev-devel \
-	libunwind-devel \
-	libuuid-devel \
-	make \
+	tbb-devel"
+
+# PMDK's dependencies (optional; libpmemobj-devel package may be used instead)
+ARG PMDK_DEPS="\
+	autoconf \
+	automake \
+	daxctl-devel \
+	gdb \
 	man \
-	ncurses-devel \
 	ndctl-devel \
-	open-sans-fonts \
 	pandoc \
-	passwd \
-	perl-Text-Diff \
 	rpm-build \
 	rpm-build-libs \
 	rpmdevtools \
-	SFML-devel \
-	sudo \
+	which"
+
+# pmem's Valgrind (optional; valgrind-devel may be used instead)
+ARG VALGRIND_DEPS="\
+	autoconf \
+	automake"
+
+# Examples (optional)
+ARG EXAMPLES_DEPS="\
+	ncurses-devel \
+	SFML-devel"
+
+# Documentation (optional)
+ARG DOC_DEPS="\
+	doxygen"
+
+# Tests (optional)
+ARG TESTS_DEPS="\
+	gdb \
+	libunwind-devel"
+
+# Misc for our builds/CI (optional)
+ARG MISC_DEPS="\
+	clang \
+	hub \
+	perl-Text-Diff \
+	pkgconf \
+	sudo"
+
+ARG REDUNDANT_DEPS="\
+	bash-completion \
+	open-sans-fonts \
+	passwd \
 	tar \
-	tbb-devel \
-	wget \
-	which \
 	xmlto \
+	asciidoc \
+	json-c-devel \
+	kmod-devel \
+	libtool \
+	libudev-devel \
+	libuuid-devel \
+	wget"
+
+# Update packages and install basic tools
+RUN dnf update -y \
+ && dnf install -y \
+	${BASE_DEPS} \
+	${LIBPMEMOBJ_CPP_DEPS} \
+	${PMDK_DEPS} \
+	${VALGRIND_DEPS} \
+	${EXAMPLES_DEPS} \
+	${DOC_DEPS} \
+	${TESTS_DEPS} \
+	${COVERITY_DEPS} \
+	${MISC_DEPS} \
  && dnf clean all
 
 # Install valgrind

utils/docker/images/Dockerfile.fedora-rawhide

@@ -8,7 +8,7 @@
 #
 
 # Pull base image
-FROM registry.fedoraproject.org/fedora:rawhide
+FROM fedora:rawhide
 MAINTAINER igor.chorazewicz@intel.com
 
 # Set required environment variables
@@ -21,54 +21,78 @@ ENV NOTTY 1
 ARG SKIP_VALGRIND_BUILD
 ARG SKIP_PMDK_BUILD
 
+# Base development packages
+ARG BASE_DEPS="\
+	cmake \
+	gcc \
+	gcc-c++ \
+	git \
+	make"
+
+# Dependencies for compiling libpmemobj-cpp project
 ARG LIBPMEMOBJ_CPP_DEPS="\
 	libatomic \
-	libpmem-devel \
 	libpmemobj-devel \
-	pmempool"
+	tbb-devel"
 
-# Install basic tools
-RUN dnf update -y \
- && dnf install -y \
-	asciidoc \
+# pmem's Valgrind (optional; valgrind-devel may be used instead)
+ARG VALGRIND_DEPS="\
 	autoconf \
-	automake \
-	bash-completion \
-	clang \
-	cmake \
-	cracklib \
-	cracklib-dicts \
-	daxctl-devel \
-	doxygen \
-	gcc \
-	gcc-c++ \
+	automake"
+
+# Examples (optional)
+ARG EXAMPLES_DEPS="\
+	ncurses-devel \
+	SFML-devel"
+
+# Documentation (optional)
+ARG DOC_DEPS="\
+	doxygen"
+
+# Tests (optional)
+ARG TESTS_DEPS="\
 	gdb \
-	git \
-	json-c-devel \
-	kmod-devel \
-	libtool \
-	libudev-devel \
+	libpmem-devel \
 	libunwind-devel \
-	libuuid-devel \
-	make \
-	man \
-	ncurses-devel \
-	ndctl-devel \
+	pmempool"
+
+# Misc for our builds/CI (optional)
+ARG MISC_DEPS="\
+	clang \
+	perl-Text-Diff \
+	pkgconf \
+	sudo"
+
+ARG REDUNDANT_DEPS="\
+	bash-completion \
 	open-sans-fonts \
-	pandoc \
 	passwd \
-	perl-Text-Diff \
-	rpm-build \
-	rpm-build-libs \
-	rpmdevtools \
-	SFML-devel \
-	sudo \
 	tar \
-	tbb-devel \
-	wget \
-	which \
 	xmlto \
-	$LIBPMEMOBJ_CPP_DEPS \
+	asciidoc \
+	json-c-devel \
+	kmod-devel \
+	libtool \
+	libudev-devel \
+	libuuid-devel \
+	libpmem-devel \
+	cracklib \
+	cracklib-dicts \
+	wget"
+
+# Update packages and install basic tools
+RUN dnf update -y \
+ && dnf install -y \
+	asciidoc \
+	${BASE_DEPS} \
+	${LIBPMEMOBJ_CPP_DEPS} \
+	${PMDK_DEPS} \
+	${VALGRIND_DEPS} \
+	${EXAMPLES_DEPS} \
+	${DOC_DEPS} \
+	${TESTS_DEPS} \
+	${COVERITY_DEPS} \
+	${MISC_DEPS} \
  && dnf clean all
 
 # Install valgrind