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

Commit 5c311e3

Browse files
lukaszstolarczuklukaszstolarczuk
authored
Merge pull request #1031 from lukaszstolarczuk/update-docker-images
Update docker images
2 parents f22c61e + 12ed664 commit 5c311e3

16 files changed

Lines changed: 466 additions & 207 deletions

‎.github/workflows/other_OSes.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,16 @@ jobs:
3030
"OS=archlinux-base OS_VER=latest",
3131
"OS=debian OS_VER=testing",
3232
"OS=debian OS_VER=unstable",
33+
"OS=debian OS_VER=latest",
3334
"OS=fedora OS_VER=33",
3435
"OS=fedora OS_VER=rawhide PUSH_IMAGE=0",
3536
"TYPE=package OS=fedora OS_VER=rawhide",
3637
"OS=opensuse-leap OS_VER=latest",
3738
"OS=opensuse-tumbleweed OS_VER=latest",
3839
"OS=ubuntu OS_VER=18.04",
3940
"OS=ubuntu OS_VER=20.10",
40-
"OS=ubuntu OS_VER=rolling PUSH_IMAGE=0",
41-
"TYPE=package OS=ubuntu OS_VER=rolling"]
41+
"OS=ubuntu OS_VER=devel PUSH_IMAGE=0",
42+
"TYPE=package OS=ubuntu OS_VER=devel"]
4243
steps:
4344
- name: Clone the git repo
4445
uses: actions/checkout@v2

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#
88

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

1313
# Set required environment variables

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#
88

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

1313
# Set required environment variables

utils/docker/images/Dockerfile.ubuntu-rolling renamed to utils/docker/images/Dockerfile.debian-latest

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@
22
# Copyright 2016-2021, Intel Corporation
33

44
#
5-
# Dockerfile - a 'recipe' for Docker to build an image of ubuntu-based
5+
# Dockerfile - a 'recipe' for Docker to build an image of debian-based
66
# environment prepared for running libpmemobj-cpp tests.
77
#
88

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

1313
# Set required environment variables
14-
ENV OS ubuntu
15-
ENV OS_VER rolling
14+
ENV OS debian
15+
ENV OS_VER latest
1616
ENV PACKAGE_MANAGER deb
1717
ENV NOTTY 1
1818

@@ -28,7 +28,7 @@ RUN apt-get update \
2828
asciidoc \
2929
autoconf \
3030
clang \
31-
clang-format-9 \
31+
clang-format \
3232
cmake \
3333
curl \
3434
debhelper \

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#
88

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

1313
# Set required environment variables

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#
88

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

1313
# Set required environment variables

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

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

99
# Pull base image
10-
FROM fedora:32
10+
FROM registry.fedoraproject.org/fedora:32
1111
MAINTAINER igor.chorazewicz@intel.com
1212

1313
# Set required environment variables
@@ -20,47 +20,72 @@ ENV NOTTY 1
2020
ARG SKIP_VALGRIND_BUILD
2121
ARG SKIP_PMDK_BUILD
2222

23-
# Install basic tools
24-
RUN dnf update -y \
25-
&& dnf install -y \
26-
asciidoc \
27-
autoconf \
28-
automake \
29-
bash-completion \
30-
clang \
23+
# Base development packages
24+
ARG BASE_DEPS="\
3125
cmake \
32-
daxctl-devel \
33-
doxygen \
3426
gcc \
3527
gcc-c++ \
36-
gdb \
3728
git \
38-
hub \
39-
json-c-devel \
40-
kmod-devel \
29+
make"
30+
31+
# Dependencies for compiling libpmemobj-cpp project
32+
ARG LIBPMEMOBJ_CPP_DEPS="\
4133
libatomic \
42-
libtool \
43-
libudev-devel \
44-
libunwind-devel \
45-
libuuid-devel \
46-
make \
34+
tbb-devel"
35+
36+
# PMDK's dependencies (optional; libpmemobj-devel package may be used instead)
37+
ARG PMDK_DEPS="\
38+
autoconf \
39+
automake \
40+
daxctl-devel \
41+
gdb \
4742
man \
48-
ncurses-devel \
4943
ndctl-devel \
50-
open-sans-fonts \
5144
pandoc \
52-
passwd \
53-
perl-Text-Diff \
5445
rpm-build \
5546
rpm-build-libs \
5647
rpmdevtools \
57-
SFML-devel \
58-
sudo \
59-
tar \
60-
tbb-devel \
61-
wget \
62-
which \
63-
xmlto \
48+
which"
49+
50+
# pmem's Valgrind (optional; valgrind-devel may be used instead)
51+
ARG VALGRIND_DEPS="\
52+
autoconf \
53+
automake"
54+
55+
# Examples (optional)
56+
ARG EXAMPLES_DEPS="\
57+
ncurses-devel \
58+
SFML-devel"
59+
60+
# Documentation (optional)
61+
ARG DOC_DEPS="\
62+
doxygen"
63+
64+
# Tests (optional)
65+
ARG TESTS_DEPS="\
66+
gdb \
67+
libunwind-devel"
68+
69+
# Misc for our builds/CI (optional)
70+
ARG MISC_DEPS="\
71+
clang \
72+
hub \
73+
perl-Text-Diff \
74+
pkgconf \
75+
sudo"
76+
77+
# Update packages and install basic tools
78+
RUN dnf update -y \
79+
&& dnf install -y \
80+
${BASE_DEPS} \
81+
${LIBPMEMOBJ_CPP_DEPS} \
82+
${PMDK_DEPS} \
83+
${VALGRIND_DEPS} \
84+
${EXAMPLES_DEPS} \
85+
${DOC_DEPS} \
86+
${TESTS_DEPS} \
87+
${COVERITY_DEPS} \
88+
${MISC_DEPS} \
6489
&& dnf clean all
6590

6691
# Install valgrind

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

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

99
# Pull base image
10-
FROM fedora:33
10+
FROM registry.fedoraproject.org/fedora:33
1111
MAINTAINER igor.chorazewicz@intel.com
1212

1313
# Set required environment variables
@@ -20,47 +20,72 @@ ENV NOTTY 1
2020
ARG SKIP_VALGRIND_BUILD
2121
ARG SKIP_PMDK_BUILD
2222

23-
# Install basic tools
24-
RUN dnf update -y \
25-
&& dnf install -y \
26-
asciidoc \
27-
autoconf \
28-
automake \
29-
bash-completion \
30-
clang \
23+
# Base development packages
24+
ARG BASE_DEPS="\
3125
cmake \
32-
daxctl-devel \
33-
doxygen \
3426
gcc \
3527
gcc-c++ \
36-
gdb \
3728
git \
38-
hub \
39-
json-c-devel \
40-
kmod-devel \
29+
make"
30+
31+
# Dependencies for compiling libpmemobj-cpp project
32+
ARG LIBPMEMOBJ_CPP_DEPS="\
4133
libatomic \
42-
libtool \
43-
libudev-devel \
44-
libunwind-devel \
45-
libuuid-devel \
46-
make \
34+
tbb-devel"
35+
36+
# PMDK's dependencies (optional; libpmemobj-devel package may be used instead)
37+
ARG PMDK_DEPS="\
38+
autoconf \
39+
automake \
40+
daxctl-devel \
41+
gdb \
4742
man \
48-
ncurses-devel \
4943
ndctl-devel \
50-
open-sans-fonts \
5144
pandoc \
52-
passwd \
53-
perl-Text-Diff \
5445
rpm-build \
5546
rpm-build-libs \
5647
rpmdevtools \
57-
SFML-devel \
58-
sudo \
59-
tar \
60-
tbb-devel \
61-
wget \
62-
which \
63-
xmlto \
48+
which"
49+
50+
# pmem's Valgrind (optional; valgrind-devel may be used instead)
51+
ARG VALGRIND_DEPS="\
52+
autoconf \
53+
automake"
54+
55+
# Examples (optional)
56+
ARG EXAMPLES_DEPS="\
57+
ncurses-devel \
58+
SFML-devel"
59+
60+
# Documentation (optional)
61+
ARG DOC_DEPS="\
62+
doxygen"
63+
64+
# Tests (optional)
65+
ARG TESTS_DEPS="\
66+
gdb \
67+
libunwind-devel"
68+
69+
# Misc for our builds/CI (optional)
70+
ARG MISC_DEPS="\
71+
clang \
72+
hub \
73+
perl-Text-Diff \
74+
pkgconf \
75+
sudo"
76+
77+
# Update packages and install basic tools
78+
RUN dnf update -y \
79+
&& dnf install -y \
80+
${BASE_DEPS} \
81+
${LIBPMEMOBJ_CPP_DEPS} \
82+
${PMDK_DEPS} \
83+
${VALGRIND_DEPS} \
84+
${EXAMPLES_DEPS} \
85+
${DOC_DEPS} \
86+
${TESTS_DEPS} \
87+
${COVERITY_DEPS} \
88+
${MISC_DEPS} \
6489
&& dnf clean all
6590

6691
# Install valgrind

0 commit comments

Comments
 (0)