CVS 46555 RedHat UBI base image (openvinotoolkit#458)

dtrawins · mzegla · web-flow · commit 2801c6bd0f4f · 2021-03-11T09:37:51.000+01:00
Co-authored-by: Miłosz Żeglarski &lt;milosz.zeglarski@intel.com&gt;
diff --git a/Dockerfile.redhat b/Dockerfile.redhat
@@ -0,0 +1,182 @@
+#
+# Copyright (c) 2020-2021 Intel Corporation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+ARG BASE_IMAGE=registry.access.redhat.com/ubi8/ubi:8.2
+FROM $BASE_IMAGE as base_build
+
+LABEL version="1.0.0"
+
+ARG PROJECT_NAME="OpenVINO Model Server 2021.2"
+
+LABEL description=${PROJECT_NAME}
+
+ARG ov_source_branch=releases/2021/2
+ARG ovms_metadata_file
+ARG ov_use_binary=1
+ARG DLDT_PACKAGE_URL
+ARG OPENVINO_NAME=${DLDT_PACKAGE_URL}
+ARG INSTALL_DIR=/opt/intel/openvino
+ARG TEMP_DIR=/tmp/openvino_installer
+ARG DL_INSTALL_DIR=/opt/intel/openvino/deployment_tools
+ARG DL_DIR=/tmp
+ARG JOBS
+ARG YUM_OV_PACKAGE=intel-openvino-runtime-centos7
+# build_type=[ opt, dbg ]
+ARG build_type=dbg
+ARG debug_bazel_flags=--strip=never\ --copt="-g"\ -c\ dbg
+
+RUN dnf install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm && yum update -d6 -y && yum install -d6 -y \
+            boost169-atomic \
+            boost169-chrono \
+            boost169-filesystem \
+            boost169-program-options \
+            boost169-thread \
+            boost169-system \
+            boost169-date-time \
+            cmake3 \
+            gcc-c++ \
+            automake \
+            autoconf \
+            curl \
+            gdb \
+            git \
+            libgusb.x86_64 \
+            libusbx \
+            libcurl-devel \
+            libtool \
+            libuuid-devel \
+            libxml2-devel \
+            make \
+            patch \
+            pkg-config \
+            pulseaudio-libs \
+            python2 \
+            python2-pip \
+            python2-devel \
+            python2-setuptools \
+            python2-virtualenv \
+            python3 \
+            python3-pip \
+            python3-devel \
+            python3-setuptools \
+            python3-virtualenv \
+            unzip \
+            wget \
+            which \
+            yum-utils \
+            unzip && \
+            yum clean all
+
+# Set up Bazel
+ENV BAZEL_VERSION 2.0.0
+WORKDIR /bazel
+RUN curl -H "User-Agent: Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/57.0.2987.133 Safari/537.36" -fSsL -O https://github.com/bazelbuild/bazel/releases/download/$BAZEL_VERSION/bazel-$BAZEL_VERSION-installer-linux-x86_64.sh && \
+    curl -H "User-Agent: Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/57.0.2987.133 Safari/537.36" -fSsL -o /bazel/LICENSE.txt https://raw.githubusercontent.com/bazelbuild/bazel/master/LICENSE && \
+    chmod +x bazel-*.sh && \
+    ./bazel-$BAZEL_VERSION-installer-linux-x86_64.sh && \
+    cd / && \
+    rm -f /bazel/bazel-$BAZEL_VERSION-installer-linux-x86_64.sh
+
+################### TAKE OPENVINO FROM A BINARY RELEASE - buildarg ov_use_binary=1 (DEFAULT) ##########
+WORKDIR /
+# OV toolkit package
+RUN if [ "$ov_use_binary" == "1" ] && [ "$DLDT_PACKAGE_URL" != "" ]; then true ; else exit 0 ; fi ; mkdir -p $TEMP_DIR && cd $TEMP_DIR/ && \
+    wget $DLDT_PACKAGE_URL && \
+    mkdir /opt/intel && \
+    tar -zxf l_openvino_toolkit*.tgz -C /opt/intel && \
+    ln -s /opt/intel/l_openvino_toolkit_runtime* /opt/intel/openvino
+
+
+# Build OpenVINO Model Server
+WORKDIR /ovms
+COPY .bazelrc WORKSPACE /ovms/
+COPY external /ovms/external/
+COPY third_party /ovms/third_party/
+
+RUN alternatives --set python /usr/bin/python3
+RUN bazel build --jobs=$JOBS ${debug_bazel_flags} @org_tensorflow//tensorflow/core:framework
+RUN bazel build --jobs=$JOBS ${debug_bazel_flags} @tensorflow_serving//tensorflow_serving/apis:prediction_service_cc_proto
+
+####### Azure SDK needs new boost:
+WORKDIR /boost
+RUN wget https://dl.bintray.com/boostorg/release/1.68.0/source/boost_1_68_0.tar.gz && \
+	tar xvf boost_1_68_0.tar.gz && cd boost_1_68_0 && ./bootstrap.sh && \
+	./b2 cxxstd=17 link=static cxxflags='-fPIC' cflags='-fPIC' \
+		--with-chrono --with-date_time --with-filesystem --with-program_options --with-system \
+		--with-random --with-thread --with-atomic --with-regex \
+		--with-log --with-locale \
+		install
+
+# OPENSSL
+WORKDIR /openssl
+
+RUN git clone https://github.com/openssl/openssl && cd openssl && git checkout tags/OpenSSL_1_1_1h
+RUN cd openssl && ./config --prefix=/usr/local/ssl --openssldir=/etc/pki/tls shared && make --jobs=$JOBS && make --jobs=$JOBS install || true && make --jobs=$JOBS install_runtime
+
+####### Azure SDK
+
+WORKDIR /azure
+RUN git clone https://github.com/Microsoft/cpprestsdk.git && cd cpprestsdk && git checkout tags/v2.10.16 -b v2.10.16 && git submodule update --init
+
+RUN git clone https://github.com/Azure/azure-storage-cpp.git && cd azure-storage-cpp/Microsoft.WindowsAzure.Storage && git checkout tags/v7.5.0 && mkdir build.release
+
+WORKDIR /
+RUN cp -rf /ovms/third_party/cpprest/rest_sdk_v2.10.16.patch /azure/cpprestsdk/
+RUN cd /azure/cpprestsdk/ && patch -p1 < rest_sdk_v2.10.16.patch
+RUN cp -rf /ovms/third_party/azure/azure_sdk.patch /azure/azure-storage-cpp/
+RUN cd /azure/azure-storage-cpp/ && patch -p1 < azure_sdk.patch
+WORKDIR /azure
+
+RUN cd cpprestsdk && mkdir Release/build.release && cd Release/build.release && cmake3 .. -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_CXX_FLAGS="-fPIC" -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=ON -DBoost_USE_STATIC_RUNTIME=ON -DBoost_USE_STATIC_LIBS=ON -DWERROR=OFF -DBUILD_SAMPLES=OFF -DBUILD_TESTS=OFF && make --jobs=$JOBS install
+RUN cd azure-storage-cpp/Microsoft.WindowsAzure.Storage/build.release && CASABLANCA_DIR=/azure/cpprestsdk cmake3 .. -DCMAKE_CXX_FLAGS="-fPIC" -DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=ON -DBoost_USE_STATIC_RUNTIME=ON -DBoost_USE_STATIC_LIBS=ON -DCMAKE_VERBOSE_MAKEFILE=ON && make --jobs=$JOBS && make --jobs=$JOBS install
+
+####### End of Azure SDK
+
+# WARNING - do not move this install - needed here for proper ssl linkage in rest and azure
+RUN yum install -d6 -y openssl-devel
+
+# Build AWS S3 SDK
+RUN git clone https://github.com/aws/aws-sdk-cpp.git --branch 1.7.129 --single-branch --depth 1 /awssdk
+WORKDIR /awssdk/build
+RUN cmake3 -DCMAKE_BUILD_TYPE=Release -DBUILD_ONLY=s3 -DENABLE_TESTING=OFF -DBUILD_SHARED_LIBS=OFF -DMINIMIZE_SIZE=ON -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DFORCE_SHARED_CRT=OFF -DSIMPLE_INSTALL=OFF -DCMAKE_CXX_FLAGS=" -D_GLIBCXX_USE_CXX11_ABI=1 " ..
+RUN make --jobs=$JOBS
+RUN mv .deps/install/lib64 .deps/install/lib
+
+####### End of AWS S3 SDK
+
+RUN cp -v /etc/ssl/certs/ca-bundle.crt /etc/ssl/certs/ca-certificates.crt
+
+WORKDIR /ovms
+
+COPY src/ /ovms/src/
+COPY release_files/ /ovms/release_files/
+
+# Set OVMS version strings
+RUN bash -c "sed -i -e 's|REPLACE_PROJECT_NAME|${PROJECT_NAME}|g' /ovms/src/version.hpp"
+RUN if [ "$ov_use_binary" == "1" ] ; then true ; else exit 0 ; fi ; sed -i -e "s#REPLACE_OPENVINO_NAME#`find /opt/intel/ -maxdepth 1 -type d | grep openvino | cut -d'_' -f2`#g" /ovms/src/version.hpp
+
+ENV LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:/opt/intel/openvino/deployment_tools/inference_engine/lib/intel64/:/opt/intel/openvino/deployment_tools/ngraph/lib/:/opt/intel/openvino/inference_engine/external/tbb/lib/:/openvino/bin/intel64/Release/lib/
+
+RUN bazel build ${debug_bazel_flags} --jobs $JOBS //src:ovms
+RUN bazel build ${debug_bazel_flags} --jobs $JOBS //src:libsampleloader.so
+
+RUN cd /ovms/src/test/cpu_extension/ && make
+
+RUN bazel test ${debug_bazel_flags} --jobs $JOBS --test_summary=detailed --test_output=all //src:ovms_test
+
+COPY ${ovms_metadata_file} metadata.json
+
+RUN ./bazel-bin/src/./ovms
diff --git a/DockerfileMakePackage b/DockerfileMakePackage
@@ -19,7 +19,7 @@ ARG BUILD_IMAGE=ovms-centos:latest
 FROM $BUILD_IMAGE
 
 ARG ov_use_binary=1
-
+RUN yum install -y xz
 RUN mkdir /patchelf && cd /patchelf && \
 	wget https://github.com/NixOS/patchelf/archive/0.10.tar.gz && \
 	tar -xf 0.10.tar.gz && ls -lah && cd */ && \
@@ -32,7 +32,7 @@ RUN mkdir -vp /ovms_release/lib/hddl/config
 
 RUN cp /ovms/metadata.json /ovms_release/
 RUN if [ "$ov_use_binary" == "0" ] ; then true ; else exit 0 ; fi ; cp -v /openvino/bin/intel64/Release/lib/plugins.xml /ovms_release/lib/
-RUN if [ "$ov_use_binary" == "1" ] ; then true ; else exit 0 ; fi ; cp -v /opt/intel/openvino/deployment_tools/inference_engine/external/hddl/config/* /ovms_release/lib/hddl/config/
+RUN if [ "$ov_use_binary" == "1" ] ; then true ; else exit 0 ; fi ; cp -v /opt/intel/openvino/deployment_tools/inference_engine/external/hddl/config/* /ovms_release/lib/hddl/config/ || true
 RUN if [ "$ov_use_binary" == "1" ] ; then true ; else exit 0 ; fi ; cp -v /opt/intel/openvino/deployment_tools/inference_engine/lib/intel64/plugins.xml /ovms_release/lib/ && cp /opt/intel/openvino/install_dependencies/* /ovms_release/deps/
 RUN if [ "$ov_use_binary" == "1" ] ; then true ; else exit 0 ; fi ; rm -vrf /ovms_release/deps/*-devel-*
 
diff --git a/Makefile b/Makefile
@@ -40,6 +40,7 @@ BASE_OS_TAG ?= latest
 BASE_OS_TAG_UBUNTU ?= 18.04
 BASE_OS_TAG_CENTOS ?= 7
 BASE_OS_TAG_CLEARLINUX ?= latest
+BASE_OS_TAG_REDHAT ?= 8.2
 
 INSTALL_RPMS_FROM_URL ?=
 
@@ -61,6 +62,11 @@ else
   BAZEL_DEBUG_FLAGS=" --strip=never "
 endif
 
+# Option to Override release image.
+# Release image OS *must have* glibc version >= glibc version on BASE_OS:
+DIST_OS ?= $(BASE_OS)
+DIST_OS_TAG ?= $(BASE_OS_TAG)
+
 ifeq ($(BASE_OS),ubuntu)
   BASE_OS_TAG=$(BASE_OS_TAG_UBUNTU)
 endif
@@ -70,11 +76,13 @@ endif
 ifeq ($(BASE_OS),clearlinux)
   BASE_OS_TAG=$(BASE_OS_TAG_CLEARLINUX)
 endif
-
-# Option to Override release image.
-# Release image OS *must have* glibc version >= glibc version on BASE_OS:
-DIST_OS ?= $(BASE_OS)
-DIST_OS_TAG ?= $(BASE_OS_TAG)
+ifeq ($(BASE_OS),redhat)
+  BASE_OS_TAG=$(BASE_OS_TAG_REDHAT)
+  BASE_IMAGE=registry.access.redhat.com/ubi8/ubi:8.2
+  DIST_OS=redhat
+  DIST_OS_TAG=$(BASE_OS_TAG_REDHAT)
+  DLDT_PACKAGE_URL=http://s3.toolbox.iotg.sclab.intel.com/ov-packages/l_openvino_toolkit_runtime_rhel8_p_2021.3.323.tgz
+endif
 
 OVMS_CPP_DOCKER_IMAGE ?= openvino/model_server
 OVMS_CPP_IMAGE_TAG ?= latest
@@ -192,7 +200,7 @@ endif
     	-t $(OVMS_CPP_DOCKER_IMAGE)-gpu:$(OVMS_CPP_IMAGE_TAG) && \
     	docker tag $(OVMS_CPP_DOCKER_IMAGE)-gpu:$(OVMS_CPP_IMAGE_TAG) $(OVMS_CPP_DOCKER_IMAGE):$(OVMS_CPP_IMAGE_TAG)-gpu
 	cd extras/nginx-mtls-auth && \
-	    http_proxy=$(HTTP_PROXY) https_proxy=$(HTTPS_PROXY) no_proxy=$(NO_PROXY) ./build.sh "$(OVMS_CPP_DOCKER_IMAGE):$(OVMS_CPP_IMAGE_TAG)" "$(OVMS_CPP_DOCKER_IMAGE)-nginx-mtls:$(OVMS_CPP_IMAGE_TAG)" && \
+	    http_proxy=$(HTTP_PROXY) https_proxy=$(HTTPS_PROXY) no_proxy=$(NO_PROXY) ./build.sh "$(OVMS_CPP_DOCKER_IMAGE):$(OVMS_CPP_IMAGE_TAG)" "$(OVMS_CPP_DOCKER_IMAGE)-nginx-mtls:$(OVMS_CPP_IMAGE_TAG)" "$(BASE_OS)" && \
 	    docker tag $(OVMS_CPP_DOCKER_IMAGE)-nginx-mtls:$(OVMS_CPP_IMAGE_TAG) $(OVMS_CPP_DOCKER_IMAGE):$(OVMS_CPP_IMAGE_TAG)-nginx-mtls
 
 test_checksec:
diff --git a/extras/nginx-mtls-auth/Dockerfile.centos b/extras/nginx-mtls-auth/Dockerfile.centos
diff --git a/extras/nginx-mtls-auth/Dockerfile.redhat b/extras/nginx-mtls-auth/Dockerfile.redhat
@@ -0,0 +1,38 @@
+#
+# Copyright (c) 2021 Intel Corporation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+ARG BASE_IMAGE=openvino/model_server:latest
+FROM $BASE_IMAGE
+USER root
+RUN     set -e ; \
+        set -x ; \
+        mkdir /certs ; \
+        microdnf install systemd wget; \
+        rpm -Uv http://nginx.org/packages/mainline/centos/8/x86_64/RPMS/nginx-1.19.7-1.el8.ngx.x86_64.rpm ; \
+        wget -O /usr/bin/dumb-init https://github.com/Yelp/dumb-init/releases/download/v1.2.2/dumb-init_1.2.2_amd64 ; \
+        chmod +x /usr/bin/dumb-init ; \
+        touch /run/nginx.pid ; mkdir -p /var/lib/nginx/tmp/ ; \
+        chmod -R 777 /etc/nginx/conf.d/ /var/log/nginx/ /certs/ /var/lib/nginx/ /var/lib/nginx/tmp/ ; \
+        sed -i 's,listen       80 default_server;,listen       unix:/tmp/nginx-default.sock;,' /etc/nginx/nginx.conf ; \
+        sed -i 's,listen       \[::\]:80 default_server;,,' /etc/nginx/nginx.conf ; \
+        sed -i 's,pid /run/nginx.pid;,pid /tmp/nginx.pid;,' /etc/nginx/nginx.conf ; \
+        sed -i 's,user nginx;,,' /etc/nginx/nginx.conf ;
+
+COPY ovms_wrapper /
+COPY model_server.conf.template /
+USER ovms
+ENTRYPOINT ["/usr/bin/dumb-init", "--", "/ovms_wrapper"]
+
diff --git a/extras/nginx-mtls-auth/build.sh b/extras/nginx-mtls-auth/build.sh
@@ -17,8 +17,9 @@
 
 BASE_IMAGE=${1:-openvino/model_server:latest}
 OUTPUT_IMAGE=${2:-openvino/model_server:nginx-mtls}
+BASE_OS=${3:=centos}
 
-docker build  -f Dockerfile . --no-cache \
+docker build  -f Dockerfile.$BASE_OS . --no-cache \
         --build-arg http_proxy="$http_proxy" --build-arg https_proxy="$https_proxy" \
         --build-arg no_proxy="$no_proxy" \
         --build-arg BASE_IMAGE="$BASE_IMAGE" \
diff --git a/release_files/Dockerfile.redhat b/release_files/Dockerfile.redhat
@@ -0,0 +1,71 @@
+#
+# Copyright (c) 2020 Intel Corporation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+ARG BASE_IMAGE=registry.access.redhat.com/ubi8/ubi:8.2
+FROM $BASE_IMAGE as base_build
+RUN yum install -y xz
+WORKDIR /
+COPY ovms.tar.xz /
+RUN env
+RUN tar -xf ovms.tar.xz
+RUN groupadd --gid 5000 ovms && useradd --home-dir /home/ovms --create-home --uid 5000 \
+             --gid 5000 --shell /bin/bash --skel /dev/null ovms && \
+    chown -R ovms:ovms /ovms
+
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ #
+
+FROM registry.access.redhat.com/ubi8/ubi-minimal as release
+ARG INSTALL_RPMS_FROM_URL=
+ENV INSTALL_RPMS_FROM_URL=$INSTALL_RPMS_FROM_URL
+ARG GPU=1
+ENV GPU=$GPU
+WORKDIR /
+
+RUN     set -e ; \
+        set -x ; \
+        if [ "$GPU" == "1" ] ; then \
+                mkdir /tmp/gpu_deps ; \
+                curl -L -o /tmp/gpu_deps/intel-igc-core-1.0.2597-1.el7.x86_64.rpm https://sourceforge.net/projects/intel-compute-runtime/files/19.41.14441/centos-7/intel-igc-core-1.0.2597-1.el7.x86_64.rpm/download ; \
+                curl -L -o /tmp/gpu_deps/intel-opencl-19.41.14441-1.el7.x86_64.rpm https://sourceforge.net/projects/intel-compute-runtime/files/19.41.14441/centos-7/intel-opencl-19.41.14441-1.el7.x86_64.rpm/download ; \
+                curl -L -o /tmp/gpu_deps/intel-igc-opencl-devel-1.0.2597-1.el7.x86_64.rpm https://sourceforge.net/projects/intel-compute-runtime/files/19.41.14441/centos-7/intel-igc-opencl-devel-1.0.2597-1.el7.x86_64.rpm/download ; \
+                curl -L -o /tmp/gpu_deps/intel-igc-opencl-1.0.2597-1.el7.x86_64.rpm https://sourceforge.net/projects/intel-compute-runtime/files/19.41.14441/centos-7/intel-igc-opencl-1.0.2597-1.el7.x86_64.rpm/download ; \
+                curl -L -o /tmp/gpu_deps/intel-gmmlib-19.3.2-1.el7.x86_64.rpm https://sourceforge.net/projects/intel-compute-runtime/files/19.41.14441/centos-7/intel-gmmlib-19.3.2-1.el7.x86_64.rpm/download ; \
+                curl -L -o /tmp/gpu_deps/intel-gmmlib-devel-19.3.2-1.el7.x86_64.rpm https://sourceforge.net/projects/intel-compute-runtime/files/19.41.14441/centos-7/intel-gmmlib-devel-19.3.2-1.el7.x86_64.rpm/download ; \
+                cd /tmp/gpu_deps && rpm -iv *.rpm && rm -Rf /tmp/gpu_deps ; \
+        fi ; \
+        if [ "$INSTALL_RPMS_FROM_URL" == "" ] ; then \
+                rpm -ivh http://mirror.centos.org/centos/8/AppStream/x86_64/os/Packages/ocl-icd-2.2.12-1.el8.x86_64.rpm; \
+        else  \
+                microdnf install tar gzip; \
+                mkdir /tmp_ovms /src ; \
+                cd /tmp_ovms ; \
+                curl -L --fail -o deps.tar.xz "$INSTALL_RPMS_FROM_URL" ; \
+                tar -xf deps.tar.xz ; \
+                ls -Rahl . ; \
+                mv -v pkg/src/*.src.rpm /src/ ; \
+                rpm -vi pkg/bin/*.rpm ; \
+                cd / ; \
+                rm -rf /tmp_ovms ; \
+        fi ; \
+        microdnf install shadow-utils; \
+        cp -v /etc/ssl/certs/ca-bundle.crt /etc/ssl/certs/ca-certificates.crt ; \
+        groupadd --gid 5000 ovms && useradd --home-dir /home/ovms --create-home --uid 5000 \
+             --gid 5000 --shell /bin/bash --skel /dev/null ovms
+
+COPY --from=base_build /ovms /ovms
+ENV LD_LIBRARY_PATH=/ovms/lib
+USER ovms
+ENTRYPOINT ["/ovms/bin/ovms"]
diff --git a/release_files/README.md b/release_files/README.md
@@ -13,8 +13,14 @@ NOTE: If necessary, ensure that you have a `http_proxy` and `https_proxy` enviro
 
 ### Build image
 
+CentOS base image:
+```bash
+make docker_build
+
 ```
-make centos
+RedHat base image:
+```bash
+make docker_build BASE_OS=redhat
 ```
 
 Image will be tagged ovms:latest.
diff --git a/src/test/ovmsconfig_test.cpp b/src/test/ovmsconfig_test.cpp
@@ -186,8 +186,7 @@ TEST_F(OvmsParamsTest, hostname_ip_regex) {
     EXPECT_EQ(ovms::Config::instance().check_hostname_or_ip("example.com"), true);
     EXPECT_EQ(ovms::Config::instance().check_hostname_or_ip("    "), false);
     EXPECT_EQ(ovms::Config::instance().check_hostname_or_ip("(%$#*F"), false);
-    std::string too_long = "";
-    std::fill(too_long.begin(), too_long.begin() + 256, 'a');
+    std::string too_long(256, 'a');
     EXPECT_EQ(ovms::Config::instance().check_hostname_or_ip(too_long), false);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -186,8 +186,7 @@ TEST_F(OvmsParamsTest, hostname_ip_regex) {`
`186`	`186`	`EXPECT_EQ(ovms::Config::instance().check_hostname_or_ip("example.com"), true);`
`187`	`187`	`EXPECT_EQ(ovms::Config::instance().check_hostname_or_ip(" "), false);`
`188`	`188`	`EXPECT_EQ(ovms::Config::instance().check_hostname_or_ip("(%$#*F"), false);`
`189`		`- std::string too_long = "";`
`190`		`- std::fill(too_long.begin(), too_long.begin() + 256, 'a');`
	`189`	`+ std::string too_long(256, 'a');`
`191`	`190`	`EXPECT_EQ(ovms::Config::instance().check_hostname_or_ip(too_long), false);`
`192`	`191`	`}`
`193`	`192`