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

Commit dc7da4b

Browse files
lukaszstolarczuklukaszstolarczuk
committed
docker: update Fedora rawhide and Arch Linux registry paths
and clean up images a little.
1 parent 49067ef commit dc7da4b

14 files changed

Lines changed: 57 additions & 35 deletions

‎utils/docker/images/Dockerfile.archlinux-base-latest‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#
88

99
# Pull base image
10-
FROM registry.hub.docker.com/archlinux/base:latest
10+
FROM registry.hub.docker.com/library/archlinux:base
1111
MAINTAINER igor.chorazewicz@intel.com
1212

1313
# Set required environment variables
@@ -31,7 +31,7 @@ ARG BASE_DEPS="\
3131
ARG LIBPMEMOBJ_CPP_DEPS="\
3232
intel-tbb"
3333

34-
# ndctl's dependencies (optional; ndctl-devel & daxctl-devel may be used instead)
34+
# ndctl's dependencies (optional; ndctl package may be used instead)
3535
ARG NDCTL_DEPS="\
3636
automake \
3737
asciidoc \
@@ -47,7 +47,7 @@ ARG PMDK_DEPS="\
4747
python3 \
4848
which"
4949

50-
# pmem's Valgrind (optional; valgrind package may be used instead)
50+
# pmem's Valgrind dependencies (optional; valgrind package may be used instead)
5151
ARG VALGRIND_DEPS="\
5252
autoconf \
5353
automake"
@@ -75,7 +75,7 @@ ARG MISC_DEPS="\
7575
sudo \
7676
whois"
7777

78-
# Update the Apt cache and install basic tools
78+
# Update the pacman cache and install basic tools
7979
RUN pacman -Syu --noconfirm \
8080
&& pacman -S --noconfirm \
8181
${BASE_DEPS} \

‎utils/docker/images/Dockerfile.centos-8‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ ARG PMDK_DEPS="\
4848
rpmdevtools \
4949
which"
5050

51-
# pmem's Valgrind (optional; valgrind-devel may be used instead)
51+
# pmem's Valgrind dependencies (optional; valgrind-devel package may be used instead)
5252
ARG VALGRIND_DEPS="\
5353
autoconf \
5454
automake"
@@ -62,6 +62,7 @@ ARG DOC_DEPS="\
6262
doxygen"
6363

6464
# Tests (optional)
65+
# NOTE: glibc is installed as a separate command; see below
6566
ARG TESTS_DEPS="\
6667
gdb \
6768
libunwind-devel"
@@ -89,6 +90,7 @@ RUN dnf update -y \
8990
${DOC_DEPS} \
9091
${TESTS_DEPS} \
9192
${MISC_DEPS} \
93+
&& dnf debuginfo-install -y glibc \
9294
&& dnf clean all
9395

9496
# Install valgrind

‎utils/docker/images/Dockerfile.debian-latest‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,15 @@ ARG SKIP_PMDK_BUILD
2323
# Base development packages
2424
ARG BASE_DEPS="\
2525
cmake \
26-
gcc \
26+
build-essential \
2727
git"
2828

2929
# Dependencies for compiling libpmemobj-cpp project
3030
ARG LIBPMEMOBJ_CPP_DEPS="\
3131
libatomic1 \
3232
libtbb-dev"
3333

34-
# PMDK's dependencies (optional; libpmemobj-devel package may be used instead)
34+
# PMDK's dependencies (optional; libpmemobj-dev package may be used instead)
3535
ARG PMDK_DEPS="\
3636
autoconf \
3737
automake \
@@ -43,7 +43,7 @@ ARG PMDK_DEPS="\
4343
pandoc \
4444
python3"
4545

46-
# pmem's Valgrind (optional; valgrind may be used instead)
46+
# pmem's Valgrind dependencies (optional; valgrind package may be used instead)
4747
ARG VALGRIND_DEPS="\
4848
autoconf \
4949
automake"
@@ -61,6 +61,7 @@ ARG DOC_DEPS="\
6161
# Tests (optional)
6262
ARG TESTS_DEPS="\
6363
gdb \
64+
libc6-dbg \
6465
libunwind-dev"
6566

6667
# Misc for our builds/CI (optional)
@@ -73,9 +74,9 @@ ARG MISC_DEPS="\
7374

7475
ENV DEBIAN_FRONTEND noninteractive
7576

76-
# Update the Apt cache and install basic tools
77+
# Update the apt cache and install basic tools
7778
RUN apt-get update \
78-
&& apt-get install -y software-properties-common \
79+
&& apt-get install -y --no-install-recommends \
7980
${BASE_DEPS} \
8081
${LIBPMEMOBJ_CPP_DEPS} \
8182
${PMDK_DEPS} \

‎utils/docker/images/Dockerfile.debian-testing‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,15 @@ ARG SKIP_PMDK_BUILD
2323
# Base development packages
2424
ARG BASE_DEPS="\
2525
cmake \
26-
gcc \
26+
build-essential \
2727
git"
2828

2929
# Dependencies for compiling libpmemobj-cpp project
3030
ARG LIBPMEMOBJ_CPP_DEPS="\
3131
libatomic1 \
3232
libtbb-dev"
3333

34-
# PMDK's dependencies (optional; libpmemobj package may be used instead)
34+
# PMDK's dependencies (optional; libpmemobj-dev package may be used instead)
3535
ARG PMDK_DEPS="\
3636
autoconf \
3737
automake \
@@ -43,7 +43,7 @@ ARG PMDK_DEPS="\
4343
pandoc \
4444
python3"
4545

46-
# pmem's Valgrind (optional; valgrind-devel may be used instead)
46+
# pmem's Valgrind dependencies (optional; valgrind package may be used instead)
4747
ARG VALGRIND_DEPS="\
4848
autoconf \
4949
automake"
@@ -61,6 +61,7 @@ ARG DOC_DEPS="\
6161
# Tests (optional)
6262
ARG TESTS_DEPS="\
6363
gdb \
64+
libc6-dbg \
6465
libunwind-dev"
6566

6667
# Misc for our builds/CI (optional)
@@ -73,9 +74,9 @@ ARG MISC_DEPS="\
7374

7475
ENV DEBIAN_FRONTEND noninteractive
7576

76-
# Update the Apt cache and install basic tools
77+
# Update the apt cache and install basic tools
7778
RUN apt-get update \
78-
&& apt-get install -y software-properties-common \
79+
&& apt-get install -y --no-install-recommends \
7980
${BASE_DEPS} \
8081
${LIBPMEMOBJ_CPP_DEPS} \
8182
${PMDK_DEPS} \

‎utils/docker/images/Dockerfile.debian-unstable‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,15 @@ ARG SKIP_PMDK_BUILD
2323
# Base development packages
2424
ARG BASE_DEPS="\
2525
cmake \
26-
gcc \
26+
build-essential \
2727
git"
2828

2929
# Dependencies for compiling libpmemobj-cpp project
3030
ARG LIBPMEMOBJ_CPP_DEPS="\
3131
libatomic1 \
3232
libtbb-dev"
3333

34-
# PMDK's dependencies (optional; libpmemobj package may be used instead)
34+
# PMDK's dependencies (optional; libpmemobj-dev package may be used instead)
3535
ARG PMDK_DEPS="\
3636
autoconf \
3737
automake \
@@ -43,7 +43,7 @@ ARG PMDK_DEPS="\
4343
pandoc \
4444
python3"
4545

46-
# pmem's Valgrind (optional; valgrind-devel may be used instead)
46+
# pmem's Valgrind dependencies (optional; valgrind package may be used instead)
4747
ARG VALGRIND_DEPS="\
4848
autoconf \
4949
automake"
@@ -61,6 +61,7 @@ ARG DOC_DEPS="\
6161
# Tests (optional)
6262
ARG TESTS_DEPS="\
6363
gdb \
64+
libc6-dbg \
6465
libunwind-dev"
6566

6667
# Misc for our builds/CI (optional)
@@ -73,9 +74,9 @@ ARG MISC_DEPS="\
7374

7475
ENV DEBIAN_FRONTEND noninteractive
7576

76-
# Update the Apt cache and install basic tools
77+
# Update the apt cache and install basic tools
7778
RUN apt-get update \
78-
&& apt-get install -y software-properties-common \
79+
&& apt-get install -y --no-install-recommends \
7980
${BASE_DEPS} \
8081
${LIBPMEMOBJ_CPP_DEPS} \
8182
${PMDK_DEPS} \
@@ -84,7 +85,7 @@ RUN apt-get update \
8485
${DOC_DEPS} \
8586
${TESTS_DEPS} \
8687
${MISC_DEPS} \
87-
&& rm -rf /var/lib/apt/lists/*
88+
&& rm -rf /var/lib/apt/lists/*
8889

8990
# Install valgrind
9091
COPY install-valgrind.sh install-valgrind.sh

‎utils/docker/images/Dockerfile.fedora-32‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ ARG PMDK_DEPS="\
4848
rpmdevtools \
4949
which"
5050

51-
# pmem's Valgrind (optional; valgrind-devel may be used instead)
51+
# pmem's Valgrind dependencies (optional; valgrind-devel package may be used instead)
5252
ARG VALGRIND_DEPS="\
5353
autoconf \
5454
automake"
@@ -63,6 +63,7 @@ ARG DOC_DEPS="\
6363
doxygen"
6464

6565
# Tests (optional)
66+
# NOTE: glibc is installed as a separate command; see below
6667
ARG TESTS_DEPS="\
6768
gdb \
6869
libunwind-devel"
@@ -86,6 +87,7 @@ RUN dnf update -y \
8687
${DOC_DEPS} \
8788
${TESTS_DEPS} \
8889
${MISC_DEPS} \
90+
&& dnf debuginfo-install -y glibc \
8991
&& dnf clean all
9092

9193
# Install valgrind

‎utils/docker/images/Dockerfile.fedora-33‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ ARG PMDK_DEPS="\
4848
rpmdevtools \
4949
which"
5050

51-
# pmem's Valgrind (optional; valgrind-devel may be used instead)
51+
# pmem's Valgrind dependencies (optional; valgrind-devel package may be used instead)
5252
ARG VALGRIND_DEPS="\
5353
autoconf \
5454
automake"
@@ -63,6 +63,7 @@ ARG DOC_DEPS="\
6363
doxygen"
6464

6565
# Tests (optional)
66+
# NOTE: glibc is installed as a separate command; see below
6667
ARG TESTS_DEPS="\
6768
gdb \
6869
libunwind-devel"
@@ -85,6 +86,7 @@ RUN dnf update -y \
8586
${DOC_DEPS} \
8687
${TESTS_DEPS} \
8788
${MISC_DEPS} \
89+
&& dnf debuginfo-install -y glibc \
8890
&& dnf clean all
8991

9092
# Install valgrind

‎utils/docker/images/Dockerfile.fedora-rawhide‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
#
55
# Dockerfile - a 'recipe' for Docker to build an image of fedora-based
66
# environment prepared for running libpmemobj-cpp tests.
7-
# PMDK (libpmem & libpmemobj) are installed from dnf repo.
7+
# PMDK (libpmem & libpmemobj) and Valgrind are installed from dnf repo.
88
#
99

1010
# Pull base image
11-
FROM fedora:rawhide
11+
FROM registry.fedoraproject.org/fedora:rawhide
1212
MAINTAINER igor.chorazewicz@intel.com
1313

1414
# Set required environment variables
@@ -41,6 +41,7 @@ ARG DOC_DEPS="\
4141
doxygen"
4242

4343
# Tests (optional)
44+
# NOTE: glibc is installed as a separate command; see below
4445
ARG TESTS_DEPS="\
4546
gdb \
4647
libpmem-devel \
@@ -64,6 +65,7 @@ RUN dnf update -y \
6465
${DOC_DEPS} \
6566
${TESTS_DEPS} \
6667
${MISC_DEPS} \
68+
&& dnf debuginfo-install -y glibc \
6769
&& dnf clean all
6870

6971
# Add user

‎utils/docker/images/Dockerfile.opensuse-leap-latest‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ ARG PMDK_DEPS="\
4646
rpmdevtools \
4747
which"
4848

49-
# pmem's Valgrind (optional; valgrind package may be used instead)
49+
# pmem's Valgrind dependencies (optional; valgrind-devel package may be used instead)
5050
ARG VALGRIND_DEPS="\
5151
autoconf \
5252
automake"
@@ -62,6 +62,7 @@ ARG DOC_DEPS="\
6262
# Tests (optional)
6363
ARG TESTS_DEPS="\
6464
gdb \
65+
glibc-debuginfo \
6566
libunwind-devel"
6667

6768
# Misc for our builds/CI (optional)
@@ -72,8 +73,10 @@ ARG MISC_DEPS="\
7273
sudo"
7374

7475
# Update the OS, packages and install basic tools
76+
# using additional repos for glibc debuginfo
7577
RUN zypper dup -y \
7678
&& zypper update -y \
79+
&& zypper mr -e repo-debug \
7780
&& zypper install -y \
7881
${BASE_DEPS} \
7982
${LIBPMEMOBJ_CPP_DEPS} \

‎utils/docker/images/Dockerfile.opensuse-tumbleweed-latest‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ ARG PMDK_DEPS="\
4646
rpmdevtools \
4747
which"
4848

49-
# pmem's Valgrind (optional; valgrind package may be used instead)
49+
# pmem's Valgrind dependencies (optional; valgrind-devel package may be used instead)
5050
ARG VALGRIND_DEPS="\
5151
autoconf \
5252
automake"
@@ -62,6 +62,7 @@ ARG DOC_DEPS="\
6262
# Tests (optional)
6363
ARG TESTS_DEPS="\
6464
gdb \
65+
glibc-debuginfo \
6566
libunwind-devel"
6667

6768
# Misc for our builds/CI (optional)
@@ -72,8 +73,10 @@ ARG MISC_DEPS="\
7273
sudo"
7374

7475
# Update the OS, packages and install basic tools
76+
# using additional repo for glibc debuginfo
7577
RUN zypper dup -y \
7678
&& zypper update -y \
79+
&& zypper mr -e repo-debug \
7780
&& zypper install -y \
7881
${BASE_DEPS} \
7982
${LIBPMEMOBJ_CPP_DEPS} \

0 commit comments

Comments
 (0)