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

Commit 3bb45ba

Browse files
Merge pull request #1120 from lukaszstolarczuk/bump-pmdk-to-1.11
[stable-1.9] docker: fix all images
2 parents 4884e82 + 3a1c4d6 commit 3bb45ba

8 files changed

Lines changed: 20 additions & 20 deletions

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

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright 2016-2020, Intel Corporation
2+
# Copyright 2016-2021, Intel Corporation
33
#
44
# Redistribution and use in source and binary forms, with or without
55
# modification, are permitted provided that the following conditions
@@ -35,7 +35,7 @@
3535
#
3636

3737
# Pull base image
38-
FROM archlinux/base:latest
38+
FROM registry.hub.docker.com/library/archlinux:base
3939
MAINTAINER szymon.romik@intel.com
4040

4141
# Set required environment variables
@@ -76,7 +76,8 @@ RUN pacman -S --noconfirm \
7676
wget \
7777
which \
7878
whois \
79-
xmlto
79+
xmlto \
80+
&& rm -rf /var/cache/pacman/pkg/*
8081

8182
# Install libndctl
8283
COPY install-libndctl.sh install-libndctl.sh
@@ -102,6 +103,3 @@ RUN rm -f $PFILE
102103
RUN sed -i 's/# %wheel ALL=(ALL) NOPASSWD: ALL/%wheel ALL=(ALL) NOPASSWD: ALL/g' /etc/sudoers
103104
RUN gpasswd wheel -a $USER
104105
USER $USER
105-
106-
# Clean the cache of packages
107-
RUN rm -rf /var/cache/pacman/pkg/*

utils/docker/images/Dockerfile.centos-8

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright 2016-2020, Intel Corporation
2+
# Copyright 2016-2021, Intel Corporation
33
#
44
# Redistribution and use in source and binary forms, with or without
55
# modification, are permitted provided that the following conditions
@@ -51,11 +51,11 @@ ARG SKIP_PMDK_BUILD
5151
RUN dnf update -y
5252
RUN dnf install -y epel-release
5353
RUN dnf install -y 'dnf-command(config-manager)'
54-
RUN dnf config-manager --set-enabled PowerTools
54+
RUN dnf config-manager --set-enabled powertools
5555

5656
# Install basic tools
5757
RUN dnf update -y \
58-
&& dnf install -y \
58+
&& dnf install -y --nobest \
5959
asciidoc \
6060
autoconf \
6161
automake \

utils/docker/images/Dockerfile.debian-testing

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright 2016-2020, Intel Corporation
2+
# Copyright 2016-2021, Intel Corporation
33
#
44
# Redistribution and use in source and binary forms, with or without
55
# modification, are permitted provided that the following conditions
@@ -55,7 +55,7 @@ RUN apt-get update \
5555
&& apt-get install -y software-properties-common \
5656
asciidoc \
5757
autoconf \
58-
clang-9 \
58+
clang \
5959
clang-format \
6060
cmake \
6161
curl \

utils/docker/images/Dockerfile.debian-unstable

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright 2016-2020, Intel Corporation
2+
# Copyright 2016-2021, Intel Corporation
33
#
44
# Redistribution and use in source and binary forms, with or without
55
# modification, are permitted provided that the following conditions
@@ -55,7 +55,7 @@ RUN apt-get update \
5555
&& apt-get install -y software-properties-common \
5656
asciidoc \
5757
autoconf \
58-
clang-9 \
58+
clang \
5959
clang-format \
6060
cmake \
6161
curl \

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright 2016-2020, Intel Corporation
2+
# Copyright 2016-2021, Intel Corporation
33
#
44
# Redistribution and use in source and binary forms, with or without
55
# modification, are permitted provided that the following conditions
@@ -85,6 +85,7 @@ RUN zypper install -y \
8585
rpm-build \
8686
rpmdevtools \
8787
sudo \
88+
systemd \
8889
tar \
8990
tbb-devel \
9091
wget \

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright 2016-2020, Intel Corporation
2+
# Copyright 2016-2021, Intel Corporation
33
#
44
# Redistribution and use in source and binary forms, with or without
55
# modification, are permitted provided that the following conditions
@@ -85,6 +85,7 @@ RUN zypper install -y \
8585
rpm-build \
8686
rpmdevtools \
8787
sudo \
88+
systemd \
8889
tar \
8990
tbb-devel \
9091
wget \

utils/docker/images/install-libndctl.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env bash
22
#
3-
# Copyright 2018-2019, Intel Corporation
3+
# Copyright 2018-2021, Intel Corporation
44
#
55
# Redistribution and use in source and binary forms, with or without
66
# modification, are permitted provided that the following conditions
@@ -41,7 +41,7 @@ OS=$1
4141
echo "==== clone ndctl repo ===="
4242
git clone https://github.com/pmem/ndctl.git
4343
cd ndctl
44-
git checkout tags/v64.1
44+
git checkout v69
4545

4646
if [ "$OS" = "fedora" ]; then
4747

utils/docker/images/install-pmdk.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env bash
22
#
3-
# Copyright 2018-2020, Intel Corporation
3+
# Copyright 2018-2021, Intel Corporation
44
#
55
# Redistribution and use in source and binary forms, with or without
66
# modification, are permitted provided that the following conditions
@@ -38,8 +38,8 @@ set -e
3838

3939
PACKAGE_MANAGER=$1
4040

41-
# tag: 1.8.1, 16.09.2020
42-
PMDK_VERSION="1.8.1"
41+
# master: 1.11.0, 02.07.2021
42+
PMDK_VERSION="8583fcfd68764ac6779e6f93db89b06971b26704"
4343

4444
if [ "${SKIP_PMDK_BUILD}" ]; then
4545
echo "Variable 'SKIP_PMDK_BUILD' is set; skipping building PMDK"

0 commit comments

Comments
 (0)