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

Bump docker images versions #667

Merged
merged 3 commits into from
Sep 11, 2020
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
8 changes: 4 additions & 4 deletions .github/workflows/gha.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,14 @@ jobs:
WORKDIR: utils/docker
strategy:
matrix:
CONFIG: ["TYPE=normal OS=fedora OS_VER=31",
CONFIG: ["TYPE=normal OS=fedora OS_VER=32",
"TYPE=normal OS=ubuntu OS_VER=19.10",
"TYPE=normal OS=ubuntu OS_VER=20.04",
"TYPE=normal OS=ubuntu OS_VER=20.04 CHECK_CPP_STYLE=1",
"TYPE=normal OS=ubuntu OS_VER=20.04 COVERAGE=1",
"TYPE=building OS=fedora OS_VER=31 COVERAGE=1 PUSH_IMAGE=1 XXX_DISABLE_AUTO_DOC_UPDATE=1",
"TYPE=building OS=fedora OS_VER=32 COVERAGE=1 PUSH_IMAGE=1 XXX_DISABLE_AUTO_DOC_UPDATE=1",
"TYPE=building OS=ubuntu OS_VER=20.04 COVERAGE=1 PUSH_IMAGE=1",
"TYPE=bindings OS=ubuntu OS_VER=20.04_bindings PUSH_IMAGE=1",
"TYPE=compatibility OS=fedora OS_VER=31",
"TYPE=compatibility OS=fedora OS_VER=32",
"TYPE=coverity OS=ubuntu OS_VER=20.04"]
steps:
- name: Clone the git repo
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@ add_custom_target(check-whitespace-main
add_dependencies(check-whitespace check-whitespace-main)

if(CHECK_CPP_STYLE)
find_program(CLANG_FORMAT NAMES clang-format clang-format-9.0)
find_program(CLANG_FORMAT NAMES clang-format clang-format-9 clang-format-9.0)
set(CLANG_FORMAT_REQUIRED "9.0")
if(CLANG_FORMAT)
get_program_version_major_minor(${CLANG_FORMAT} CLANG_FORMAT_VERSION)
Expand Down
8 changes: 4 additions & 4 deletions travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@ env:
- GITHUB_REPO=pmem/pmemkv
- DOCKERHUB_REPO=pmem/pmemkv
matrix:
- TYPE=normal OS=fedora OS_VER=31
- TYPE=normal OS=fedora OS_VER=32
- TYPE=normal OS=ubuntu OS_VER=19.10 PUSH_IMAGE=1
- TYPE=normal OS=ubuntu OS_VER=20.04
- TYPE=normal OS=ubuntu OS_VER=20.04 CHECK_CPP_STYLE=1
- TYPE=normal OS=ubuntu OS_VER=20.04 COVERAGE=1
- TYPE=building OS=fedora OS_VER=31 COVERAGE=1 PUSH_IMAGE=1 AUTO_DOC_UPDATE=1
- TYPE=building OS=fedora OS_VER=32 COVERAGE=1 PUSH_IMAGE=1 AUTO_DOC_UPDATE=1
- TYPE=building OS=ubuntu OS_VER=20.04 COVERAGE=1 PUSH_IMAGE=1
- TYPE=bindings OS=ubuntu OS_VER=20.04_bindings PUSH_IMAGE=1
- TYPE=compatibility OS=fedora OS_VER=31
- TYPE=compatibility OS=fedora OS_VER=32
- TYPE=coverity OS=ubuntu OS_VER=20.04

before_install:
Expand Down
2 changes: 1 addition & 1 deletion utils/docker/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ docker run --privileged=true --name=$containerName -i $TTY \
--env COVERITY_SCAN_NOTIFICATION_EMAIL=$COVERITY_SCAN_NOTIFICATION_EMAIL \
--env TEST_PACKAGES=${TEST_PACKAGES:-ON} \
--env BUILD_JSON_CONFIG=${BUILD_JSON_CONFIG:-ON} \
--env CHECK_CPP_STYLE=${CHECK_CPP_STYLE:-ON} \
--env CHECK_CPP_STYLE=${CHECK_CPP_STYLE:-OFF} \
--env DEFAULT_TEST_DIR=/dev/shm \
--shm-size=4G \
-v $HOST_WORKDIR:$WORKDIR \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,12 @@
#

# Pull base image
FROM fedora:31
FROM fedora:32
MAINTAINER [email protected]

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

Expand Down