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

Commit 4137208

Browse files
lukaszstolarczuklukaszstolarczuk
committed
tweak docker images files
- add skip arguments/flags for PMDK and Valgrind builds - move env variable settings to the top of the files
1 parent a003549 commit 4137208

10 files changed

Lines changed: 100 additions & 73 deletions

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

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,24 @@
3030
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
3131

3232
#
33-
# Dockerfile - a 'recipe' for Docker to build an image of environment
34-
# prepared for running libpmemobj-cpp tests.
33+
Dockerfile - a 'recipe' for Docker to build an image of archlinux-based
34+
# environment prepared for running libpmemobj-cpp tests.
3535
#
3636

3737
# Pull base image
3838
FROM archlinux/base:latest
3939
MAINTAINER szymon.romik@intel.com
4040

41+
# Set required environment variables
42+
ENV OS archlinux-base
43+
ENV OS_VER latest
44+
ENV PACKAGE_MANAGER pacman
45+
ENV NOTTY 1
46+
47+
# Additional parameters to build docker without building components
48+
ARG SKIP_VALGRIND_BUILD
49+
ARG SKIP_PMDK_BUILD
50+
4151
# Update the Apt cache and install basic tools
4252
RUN pacman -Syu --noconfirm
4353
RUN pacman -S --noconfirm \
@@ -95,9 +105,3 @@ USER $USER
95105

96106
# Clean the cache of packages
97107
RUN rm -rf /var/cache/pacman/pkg/*
98-
99-
# Set required environment variables
100-
ENV OS archlinux-base
101-
ENV OS_VER latest
102-
ENV PACKAGE_MANAGER pacman
103-
ENV NOTTY 1

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

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,16 @@
3838
FROM centos:8
3939
MAINTAINER szymon.romik@intel.com
4040

41+
# Set required environment variables
42+
ENV OS centos
43+
ENV OS_VER 8
44+
ENV PACKAGE_MANAGER rpm
45+
ENV NOTTY 1
46+
47+
# Additional parameters to build docker without building components
48+
ARG SKIP_VALGRIND_BUILD
49+
ARG SKIP_PMDK_BUILD
50+
4151
RUN dnf update -y
4252
RUN dnf install -y epel-release
4353
RUN dnf install -y 'dnf-command(config-manager)'
@@ -103,10 +113,3 @@ RUN useradd -m $USER
103113
RUN echo $USERPASS | passwd $USER --stdin
104114
RUN gpasswd wheel -a $USER
105115
USER $USER
106-
107-
# Set required environment variables
108-
ENV OS centos
109-
ENV OS_VER 8
110-
ENV PACKAGE_MANAGER rpm
111-
ENV NOTTY 1
112-

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

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,24 @@
3030
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
3131

3232
#
33-
# Dockerfile - a 'recipe' for Docker to build an image of debian-unstable
33+
# Dockerfile - a 'recipe' for Docker to build an image of debian-based
3434
# environment prepared for running libpmemobj-cpp tests.
3535
#
3636

3737
# Pull base image
3838
FROM debian:testing
3939
MAINTAINER szymon.romik@intel.com
4040

41+
# Set required environment variables
42+
ENV OS debian
43+
ENV OS_VER testing
44+
ENV PACKAGE_MANAGER deb
45+
ENV NOTTY 1
46+
47+
# Additional parameters to build docker without building components
48+
ARG SKIP_VALGRIND_BUILD
49+
ARG SKIP_PMDK_BUILD
50+
4151
ENV DEBIAN_FRONTEND noninteractive
4252

4353
# Update the Apt cache and install basic tools
@@ -90,9 +100,3 @@ ENV USER user
90100
ENV USERPASS pass
91101
RUN useradd -m $USER -g sudo -p `mkpasswd $USERPASS`
92102
USER $USER
93-
94-
# Set required environment variables
95-
ENV OS debian
96-
ENV OS_VER testing
97-
ENV PACKAGE_MANAGER deb
98-
ENV NOTTY 1

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

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,24 @@
3030
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
3131

3232
#
33-
# Dockerfile - a 'recipe' for Docker to build an image of debian-unstable
33+
# Dockerfile - a 'recipe' for Docker to build an image of debian-based
3434
# environment prepared for running libpmemobj-cpp tests.
3535
#
3636

3737
# Pull base image
3838
FROM debian:unstable
3939
MAINTAINER szymon.romik@intel.com
4040

41+
# Set required environment variables
42+
ENV OS debian
43+
ENV OS_VER unstable
44+
ENV PACKAGE_MANAGER deb
45+
ENV NOTTY 1
46+
47+
# Additional parameters to build docker without building components
48+
ARG SKIP_VALGRIND_BUILD
49+
ARG SKIP_PMDK_BUILD
50+
4151
ENV DEBIAN_FRONTEND noninteractive
4252

4353
# Update the Apt cache and install basic tools
@@ -90,9 +100,3 @@ ENV USER user
90100
ENV USERPASS pass
91101
RUN useradd -m $USER -g sudo -p `mkpasswd $USERPASS`
92102
USER $USER
93-
94-
# Set required environment variables
95-
ENV OS debian
96-
ENV OS_VER unstable
97-
ENV PACKAGE_MANAGER deb
98-
ENV NOTTY 1

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

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,16 @@
3838
FROM fedora:31
3939
MAINTAINER szymon.romik@intel.com
4040

41+
# Set required environment variables
42+
ENV OS fedora
43+
ENV OS_VER 31
44+
ENV PACKAGE_MANAGER rpm
45+
ENV NOTTY 1
46+
47+
# Additional parameters to build docker without building components
48+
ARG SKIP_VALGRIND_BUILD
49+
ARG SKIP_PMDK_BUILD
50+
4151
# Install basic tools
4252
RUN dnf update -y \
4353
&& dnf install -y \
@@ -93,10 +103,3 @@ RUN useradd -m $USER
93103
RUN echo "$USER:$USERPASS" | chpasswd
94104
RUN gpasswd wheel -a $USER
95105
USER $USER
96-
97-
# Set required environment variables
98-
ENV OS fedora
99-
ENV OS_VER 31
100-
ENV PACKAGE_MANAGER rpm
101-
ENV NOTTY 1
102-

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

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,12 @@
3838
FROM fedora:rawhide
3939
MAINTAINER szymom.romik@intel.com
4040

41+
# Set required environment variables
42+
ENV OS fedora
43+
ENV OS_VER rawhide
44+
ENV PACKAGE_MANAGER rpm
45+
ENV NOTTY 1
46+
4147
# Additional parameters to build docker without building components
4248
ARG SKIP_VALGRIND_BUILD
4349
ARG SKIP_PMDK_BUILD
@@ -100,10 +106,3 @@ RUN useradd -m $USER
100106
RUN echo "$USER:$USERPASS" | chpasswd
101107
RUN gpasswd wheel -a $USER
102108
USER $USER
103-
104-
# Set required environment variables
105-
ENV OS fedora
106-
ENV OS_VER rawhide
107-
ENV PACKAGE_MANAGER rpm
108-
ENV NOTTY 1
109-

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

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,24 @@
3030
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
3131

3232
#
33-
# Dockerfile - a 'recipe' for Docker to build an image of environment
34-
# prepared for running libpmemobj-cpp tests.
33+
# Dockerfile - a 'recipe' for Docker to build an image of opensuse-based
34+
# environment prepared for running libpmemobj-cpp tests.
3535
#
3636

3737
# Pull base image
3838
FROM opensuse/leap:latest
3939
MAINTAINER szymon.romik@intel.com
4040

41+
# Set required environment variables
42+
ENV OS opensuse-leap
43+
ENV OS_VER latest
44+
ENV PACKAGE_MANAGER rpm
45+
ENV NOTTY 1
46+
47+
# Additional parameters to build docker without building components
48+
ARG SKIP_VALGRIND_BUILD
49+
ARG SKIP_PMDK_BUILD
50+
4151
# Update the OS
4252
RUN zypper dup -y
4353

@@ -107,10 +117,3 @@ RUN sed -i 's/# %wheel ALL=(ALL) NOPASSWD: ALL/%wheel ALL=(ALL) NOPASSWD: ALL/g'
107117
RUN groupadd wheel
108118
RUN gpasswd wheel -a $USER
109119
USER $USER
110-
111-
# Set required environment variables
112-
ENV OS opensuse-leap
113-
ENV OS_VER latest
114-
ENV PACKAGE_MANAGER rpm
115-
ENV NOTTY 1
116-

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

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,24 @@
3030
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
3131

3232
#
33-
# Dockerfile - a 'recipe' for Docker to build an image of environment
34-
# prepared for running libpmemobj-cpp tests.
33+
# Dockerfile - a 'recipe' for Docker to build an image of opensuse-based
34+
# environment prepared for running libpmemobj-cpp tests.
3535
#
3636

3737
# Pull base image
3838
FROM opensuse/tumbleweed:latest
3939
MAINTAINER szymon.romik@intel.com
4040

41+
# Set required environment variables
42+
ENV OS opensuse-tumbleweed
43+
ENV OS_VER latest
44+
ENV PACKAGE_MANAGER rpm
45+
ENV NOTTY 1
46+
47+
# Additional parameters to build docker without building components
48+
ARG SKIP_VALGRIND_BUILD
49+
ARG SKIP_PMDK_BUILD
50+
4151
# Update the OS
4252
RUN zypper dup -y
4353

@@ -109,10 +119,3 @@ RUN sed -i 's/# %wheel ALL=(ALL) NOPASSWD: ALL/%wheel ALL=(ALL) NOPASSWD: ALL/g'
109119
RUN groupadd wheel
110120
RUN gpasswd wheel -a $USER
111121
USER $USER
112-
113-
# Set required environment variables
114-
ENV OS opensuse-tumbleweed
115-
ENV OS_VER latest
116-
ENV PACKAGE_MANAGER rpm
117-
ENV NOTTY 1
118-

‎utils/docker/images/Dockerfile.ubuntu-19.10‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,12 @@
3838
FROM ubuntu:19.10
3939
MAINTAINER szymon.romik@intel.com
4040

41+
# Set required environment variables
42+
ENV OS ubuntu
43+
ENV OS_VER 19.10
44+
ENV PACKAGE_MANAGER deb
45+
ENV NOTTY 1
46+
4147
# Additional parameters to build docker without building components
4248
ARG SKIP_VALGRIND_BUILD
4349
ARG SKIP_PMDK_BUILD
@@ -94,9 +100,3 @@ ENV USER user
94100
ENV USERPASS pass
95101
RUN useradd -m $USER -g sudo -p `mkpasswd $USERPASS`
96102
USER $USER
97-
98-
# Set required environment variables
99-
ENV OS ubuntu
100-
ENV OS_VER 19.10
101-
ENV PACKAGE_MANAGER deb
102-
ENV NOTTY 1

‎utils/docker/images/Dockerfile.ubuntu-rolling‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,16 @@
3838
FROM ubuntu:rolling
3939
MAINTAINER szymon.romik@intel.com
4040

41+
# Set required environment variables
42+
ENV OS ubuntu
43+
ENV OS_VER rolling
44+
ENV PACKAGE_MANAGER deb
45+
ENV NOTTY 1
46+
47+
# Additional parameters to build docker without building components
48+
ARG SKIP_VALGRIND_BUILD
49+
ARG SKIP_PMDK_BUILD
50+
4151
ENV DEBIAN_FRONTEND noninteractive
4252

4353
# Update the Apt cache and install basic tools
@@ -90,9 +100,3 @@ ENV USER user
90100
ENV USERPASS pass
91101
RUN useradd -m $USER -g sudo -p `mkpasswd $USERPASS`
92102
USER $USER
93-
94-
# Set required environment variables
95-
ENV OS ubuntu
96-
ENV OS_VER rolling
97-
ENV PACKAGE_MANAGER deb
98-
ENV NOTTY 1

0 commit comments

Comments
 (0)