Skip to content
This repository was archived by the owner on Mar 22, 2023. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ services:
env:
matrix:
- TYPE=normal OS=ubuntu OS_VER=18.04 PUSH_IMAGE=1
- TYPE=normal OS=fedora OS_VER=28 PUSH_IMAGE=1 AUTO_DOC_UPDATE=1
- TYPE=normal OS=fedora OS_VER=32 PUSH_IMAGE=1 AUTO_DOC_UPDATE=1
- TYPE=normal OS=ubuntu OS_VER=18.04 COVERAGE=1
- TYPE=coverity OS=ubuntu OS_VER=18.04

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright 2016-2018, Intel Corporation
# Copyright 2016-2020, Intel Corporation
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
Expand Down Expand Up @@ -35,7 +35,7 @@
#

# Pull base image
FROM fedora:28
FROM fedora:32
MAINTAINER marcin.slusarz@intel.com

# Install basic tools
Expand All @@ -45,6 +45,7 @@ RUN dnf update -y \
automake \
clang \
cmake \
daxctl-devel \
doxygen \
gcc \
gdb \
Expand All @@ -54,6 +55,7 @@ RUN dnf update -y \
make \
man \
ncurses-devel \
ndctl-devel \
open-sans-fonts \
passwd \
perl-Text-Diff \
Expand All @@ -75,10 +77,6 @@ RUN dnf update -y \
bash-completion \
&& dnf clean all

# Install libndctl
COPY install-libndctl.sh install-libndctl.sh
RUN ./install-libndctl.sh fedora

# Install valgrind
COPY install-valgrind.sh install-valgrind.sh
RUN ./install-valgrind.sh
Expand All @@ -97,7 +95,7 @@ USER $USER

# Set required environment variables
ENV OS fedora
ENV OS_VER 28
ENV OS_VER 32
ENV PACKAGE_MANAGER rpm
ENV NOTTY 1

10 changes: 4 additions & 6 deletions utils/docker/images/Dockerfile.ubuntu-18.04
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright 2016-2018, Intel Corporation
# Copyright 2016-2020, Intel Corporation
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
Expand Down Expand Up @@ -46,7 +46,7 @@ RUN apt-get update \
tzdata \
autoconf \
clang \
clang-format \
clang-format-6.0 \
cmake \
curl \
debhelper \
Expand All @@ -57,6 +57,8 @@ RUN apt-get update \
gdb \
git \
graphviz \
libdaxctl-dev \
libndctl-dev \
libunwind8-dev \
libtext-diff-perl \
pkg-config \
Expand All @@ -73,10 +75,6 @@ RUN apt-get update \
libudev-dev \
&& rm -rf /var/lib/apt/lists/*

# Install libndctl
COPY install-libndctl.sh install-libndctl.sh
RUN ./install-libndctl.sh

# Install valgrind
COPY install-valgrind.sh install-valgrind.sh
RUN ./install-valgrind.sh
Expand Down
92 changes: 0 additions & 92 deletions utils/docker/images/install-libndctl.sh

This file was deleted.

4 changes: 2 additions & 2 deletions utils/docker/images/install-pmdk.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
#
# Copyright 2018, Intel Corporation
# Copyright 2018-2020, Intel Corporation
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
Expand Down Expand Up @@ -38,7 +38,7 @@ set -e

git clone https://github.com/pmem/pmdk
cd pmdk
git checkout 1.5.1
git checkout 1.5.2

sudo make -j2 install prefix=/opt/pmdk

Expand Down
10 changes: 6 additions & 4 deletions utils/docker/images/install-valgrind.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
#
# Copyright 2016-2018, Intel Corporation
# Copyright 2016-2020, Intel Corporation
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
Expand Down Expand Up @@ -38,10 +38,12 @@ set -e

git clone --recursive https://github.com/pmem/valgrind.git
cd valgrind
git checkout pmem-3.13
# pmem-3.15: Merge pull request #81 from marcinslusarz/pmem-3.15
git checkout 09f75f69683d862f8456f75484fcdc0dc5508900

./autogen.sh
./configure --prefix=/usr
make
make install
make -j$(nproc)
sudo make -j$(nproc) install
cd ..
rm -rf valgrind