Skip to content
This repository was archived by the owner on Nov 4, 2024. It is now read-only.

Commit 30794c3

Browse files
lukaszstolarczuklukaszstolarczuk
authored
Merge pull request #8 from lukaszstolarczuk/update-dockers-2
Update dockers 2
2 parents baccf32 + 4e58bb4 commit 30794c3

File tree

6 files changed

+47
-46
lines changed

6 files changed

+47
-46
lines changed

‎docker/images/fedora-33.Dockerfile‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# SPDX-License-Identifier: BSD-3-Clause
2-
# Copyright 2016-2021, Intel Corporation
2+
# Copyright 2016-2022, Intel Corporation
33

44
#
55
# Dockerfile - Base image for PMDK related projects.
@@ -22,7 +22,7 @@ ARG BASE_DEPS="\
2222
git \
2323
make"
2424

25-
# PMDK's dependencies (optional; libpmemobj-devel package may be used instead)
25+
# PMDK's dependencies (optional; libpmem*-devel packages may be used instead)
2626
ARG PMDK_DEPS="\
2727
autoconf \
2828
automake \
@@ -36,6 +36,11 @@ ARG PMDK_DEPS="\
3636
rpmdevtools \
3737
which"
3838

39+
# libpmemobj-cpp's dependencies (optional; libpmemobj++-devel package may be used instead)
40+
ARG LIBPMEMOBJ_CPP_DEPS="\
41+
libatomic \
42+
tbb-devel"
43+
3944
# pmem's Valgrind (optional; valgrind-devel may be used instead)
4045
ARG VALGRIND_DEPS="\
4146
autoconf \
@@ -60,10 +65,6 @@ ARG MISC_DEPS="\
6065
pkgconf \
6166
sudo"
6267

63-
# Coverity
64-
ENV COVERITY_DEPS "\
65-
wget"
66-
6768
# Update packages and install basic tools
6869
RUN dnf update -y \
6970
&& dnf install -y \
@@ -73,7 +74,6 @@ RUN dnf update -y \
7374
${DOC_DEPS} \
7475
${TESTS_DEPS} \
7576
${MISC_DEPS} \
76-
${COVERITY_DEPS} \
7777
&& dnf debuginfo-install -y glibc \
7878
&& dnf clean all
7979

‎docker/images/fedora-34.Dockerfile‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# SPDX-License-Identifier: BSD-3-Clause
2-
# Copyright 2016-2021, Intel Corporation
2+
# Copyright 2016-2022, Intel Corporation
33

44
#
55
# Dockerfile - Base image for PMDK related projects.
@@ -22,7 +22,7 @@ ARG BASE_DEPS="\
2222
git \
2323
make"
2424

25-
# PMDK's dependencies (optional; libpmemobj-devel package may be used instead)
25+
# PMDK's dependencies (optional; libpmem*-devel packages may be used instead)
2626
ARG PMDK_DEPS="\
2727
autoconf \
2828
automake \
@@ -36,6 +36,11 @@ ARG PMDK_DEPS="\
3636
rpmdevtools \
3737
which"
3838

39+
# libpmemobj-cpp's dependencies (optional; libpmemobj++-devel package may be used instead)
40+
ARG LIBPMEMOBJ_CPP_DEPS="\
41+
libatomic \
42+
tbb-devel"
43+
3944
# pmem's Valgrind (optional; valgrind-devel may be used instead)
4045
ARG VALGRIND_DEPS="\
4146
autoconf \
@@ -60,10 +65,6 @@ ARG MISC_DEPS="\
6065
pkgconf \
6166
sudo"
6267

63-
# Coverity
64-
ENV COVERITY_DEPS "\
65-
wget"
66-
6768
# Update packages and install basic tools
6869
RUN dnf update -y \
6970
&& dnf install -y \
@@ -73,7 +74,6 @@ RUN dnf update -y \
7374
${DOC_DEPS} \
7475
${TESTS_DEPS} \
7576
${MISC_DEPS} \
76-
${COVERITY_DEPS} \
7777
&& dnf debuginfo-install -y glibc \
7878
&& dnf clean all
7979

‎docker/images/fedora-35.Dockerfile‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ ARG BASE_DEPS="\
2222
git \
2323
make"
2424

25-
# PMDK's dependencies (optional; libpmemobj-devel package may be used instead)
25+
# PMDK's dependencies (optional; libpmem*-devel packages may be used instead)
2626
ARG PMDK_DEPS="\
2727
autoconf \
2828
automake \
@@ -36,6 +36,11 @@ ARG PMDK_DEPS="\
3636
rpmdevtools \
3737
which"
3838

39+
# libpmemobj-cpp's dependencies (optional; libpmemobj++-devel package may be used instead)
40+
ARG LIBPMEMOBJ_CPP_DEPS="\
41+
libatomic \
42+
tbb-devel"
43+
3944
# pmem's Valgrind (optional; valgrind-devel may be used instead)
4045
ARG VALGRIND_DEPS="\
4146
autoconf \
@@ -60,10 +65,6 @@ ARG MISC_DEPS="\
6065
pkgconf \
6166
sudo"
6267

63-
# Coverity
64-
ENV COVERITY_DEPS "\
65-
wget"
66-
6768
# Update packages and install basic tools
6869
RUN dnf update -y \
6970
&& dnf install -y \
@@ -73,7 +74,6 @@ RUN dnf update -y \
7374
${DOC_DEPS} \
7475
${TESTS_DEPS} \
7576
${MISC_DEPS} \
76-
${COVERITY_DEPS} \
7777
&& dnf debuginfo-install -y glibc \
7878
&& dnf clean all
7979

‎docker/images/ubuntu-20.04.Dockerfile‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# SPDX-License-Identifier: BSD-3-Clause
2-
# Copyright 2016-2021, Intel Corporation
2+
# Copyright 2016-2022, Intel Corporation
33

44
#
55
# Dockerfile - Base image for PMDK related projects.
@@ -21,7 +21,7 @@ ARG BASE_DEPS="\
2121
cmake \
2222
git"
2323

24-
# PMDK's dependencies (optional; libpmemobj-devel package may be used instead)
24+
# PMDK's dependencies (optional; libpmem*-dev packages may be used instead)
2525
ARG PMDK_DEPS="\
2626
autoconf \
2727
automake \
@@ -33,7 +33,12 @@ ARG PMDK_DEPS="\
3333
pandoc \
3434
python3"
3535

36-
# pmem's Valgrind (optional; valgrind-devel may be used instead)
36+
# libpmemobj-cpp's dependencies (optional; libpmemobj-cpp-dev package may be used instead)
37+
ARG LIBPMEMOBJ_CPP_DEPS="\
38+
libatomic1 \
39+
libtbb-dev"
40+
41+
# pmem's Valgrind (optional; valgrind may be used instead)
3742
ARG VALGRIND_DEPS="\
3843
autoconf \
3944
automake"
@@ -44,9 +49,9 @@ ARG DOC_DEPS="\
4449
pandoc"
4550

4651
# Tests (optional)
47-
# NOTE: glibc is installed as a separate command; see below
4852
ARG TESTS_DEPS="\
4953
gdb \
54+
libc6-dbg \
5055
libunwind-dev"
5156

5257
# Misc for our builds/CI (optional)

‎docker/images/ubuntu-21.04.Dockerfile‎

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# SPDX-License-Identifier: BSD-3-Clause
2-
# Copyright 2016-2021, Intel Corporation
2+
# Copyright 2016-2022, Intel Corporation
33

44
#
55
# Dockerfile - Base image for PMDK related projects.
@@ -21,7 +21,7 @@ ARG BASE_DEPS="\
2121
cmake \
2222
git"
2323

24-
# PMDK's dependencies (optional; libpmemobj-devel package may be used instead)
24+
# PMDK's dependencies (optional; libpmem*-dev packages may be used instead)
2525
ARG PMDK_DEPS="\
2626
autoconf \
2727
automake \
@@ -33,7 +33,12 @@ ARG PMDK_DEPS="\
3333
pandoc \
3434
python3"
3535

36-
# pmem's Valgrind (optional; valgrind-devel may be used instead)
36+
# libpmemobj-cpp's dependencies (optional; libpmemobj-cpp-dev package may be used instead)
37+
ARG LIBPMEMOBJ_CPP_DEPS="\
38+
libatomic1 \
39+
libtbb-dev"
40+
41+
# pmem's Valgrind (optional; valgrind may be used instead)
3742
ARG VALGRIND_DEPS="\
3843
autoconf \
3944
automake"
@@ -44,9 +49,9 @@ ARG DOC_DEPS="\
4449
pandoc"
4550

4651
# Tests (optional)
47-
# NOTE: glibc is installed as a separate command; see below
4852
ARG TESTS_DEPS="\
4953
gdb \
54+
libc6-dbg \
5055
libunwind-dev"
5156

5257
# Misc for our builds/CI (optional)
@@ -57,12 +62,6 @@ ARG MISC_DEPS="\
5762
sudo \
5863
whois"
5964

60-
# Coverity
61-
ENV COVERITY_DEPS "\
62-
curl \
63-
ruby \
64-
wget"
65-
6665
ENV DEBIAN_FRONTEND noninteractive
6766

6867
# Update packages and install basic tools
@@ -74,7 +73,6 @@ RUN apt-get update \
7473
${DOC_DEPS} \
7574
${TESTS_DEPS} \
7675
${MISC_DEPS} \
77-
${COVERITY_DEPS} \
7876
&& rm -rf /var/lib/apt/lists/* \
7977
&& apt-get clean all
8078

‎docker/images/ubuntu-21.10.Dockerfile‎

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# SPDX-License-Identifier: BSD-3-Clause
2-
# Copyright 2016-2021, Intel Corporation
2+
# Copyright 2016-2022, Intel Corporation
33

44
#
55
# Dockerfile - Base image for PMDK related projects.
@@ -21,7 +21,7 @@ ARG BASE_DEPS="\
2121
cmake \
2222
git"
2323

24-
# PMDK's dependencies (optional; libpmemobj-devel package may be used instead)
24+
# PMDK's dependencies (optional; libpmem*-dev packages may be used instead)
2525
ARG PMDK_DEPS="\
2626
autoconf \
2727
automake \
@@ -33,7 +33,12 @@ ARG PMDK_DEPS="\
3333
pandoc \
3434
python3"
3535

36-
# pmem's Valgrind (optional; valgrind-devel may be used instead)
36+
# libpmemobj-cpp's dependencies (optional; libpmemobj-cpp-dev package may be used instead)
37+
ARG LIBPMEMOBJ_CPP_DEPS="\
38+
libatomic1 \
39+
libtbb-dev"
40+
41+
# pmem's Valgrind (optional; valgrind may be used instead)
3742
ARG VALGRIND_DEPS="\
3843
autoconf \
3944
automake"
@@ -44,9 +49,9 @@ ARG DOC_DEPS="\
4449
pandoc"
4550

4651
# Tests (optional)
47-
# NOTE: glibc is installed as a separate command; see below
4852
ARG TESTS_DEPS="\
4953
gdb \
54+
libc6-dbg \
5055
libunwind-dev"
5156

5257
# Misc for our builds/CI (optional)
@@ -57,12 +62,6 @@ ARG MISC_DEPS="\
5762
sudo \
5863
whois"
5964

60-
# Coverity
61-
ENV COVERITY_DEPS "\
62-
curl \
63-
ruby \
64-
wget"
65-
6665
ENV DEBIAN_FRONTEND noninteractive
6766

6867
# Update packages and install basic tools
@@ -74,7 +73,6 @@ RUN apt-get update \
7473
${DOC_DEPS} \
7574
${TESTS_DEPS} \
7675
${MISC_DEPS} \
77-
${COVERITY_DEPS} \
7876
&& rm -rf /var/lib/apt/lists/* \
7977
&& apt-get clean all
8078

0 commit comments

Comments
 (0)