bump Fedora docker image version (31 -> 32)

and run cppformat only on Ubuntu, it has required clang-format (9.0).

.github/workflows/gha.yml

@@ -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 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

travis.yml

@@ -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
     - TYPE=normal OS=ubuntu OS_VER=20.04
     - 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:

utils/docker/build.sh

@@ -98,6 +98,11 @@ if [[ "$command" == "" ]]; then
 	esac
 fi
 
+# Only check style on Ubuntu, since it has req. clang-format version (and only if it isn't explicitly turned off)
+if [ "${CHECK_CPP_STYLE}" != "OFF" ] && [ "${CHECK_CPP_STYLE}" != "0" ] && [ "${OS}" == "ubuntu"]; then
+	CHECK_CPP_STYLE=ON;
+fi
+
 if [ "$COVERAGE" == "1" ]; then
 	docker_opts="${docker_opts} `bash <(curl -s https://codecov.io/env)`";
 	ci_env=`bash <(curl -s https://codecov.io/env)`
@@ -148,7 +153,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 \

utils/docker/images/Dockerfile.debian-unstable

@@ -1,5 +1,5 @@
 #
-# Copyright 2016-2019, 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

utils/docker/images/Dockerfile.fedora-31 → utils/docker/images/Dockerfile.fedora-32

@@ -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