Merge pull request #1 from OPENAIRINTERFACE/centos8_support

Adding CentOS8 support

No support for CentOS7 is possible at the moment.

build/scripts/build_helper

@@ -24,8 +24,7 @@
 # author Laurent Thomas, Lionel GAUTHIER
 #
 #######################################
-#SUPPORTED_DISTRO="Ubuntu 18.04, CentOS 7, RHEL 7"
-SUPPORTED_DISTRO="Ubuntu 18.04"
+SUPPORTED_DISTRO="Ubuntu 18.04, CentOS 8, RHEL 8"
 if [ ! -f /etc/os-release ]; then
   echo_fatal "No /etc/os-release file found. You're likely on an unsupported distro."
 fi
@@ -128,8 +127,8 @@ check_supported_distribution() {
     local distribution=$(get_distribution_release)
     case "$distribution" in
         "ubuntu18.04") return 0 ;;
-        #"rhel7")       return 0 ;;
-        #"centos7")     return 0 ;;
+        "rhel8")       return 0 ;;
+        "centos8")     return 0 ;;
     esac
     return 1
 }

build/scripts/build_helper.fb_folly

@@ -48,31 +48,47 @@ install_fb_folly_from_source(){
   if [[ $prompt =~ [yY](es)* ]]
   then
  
-    $SUDO apt-get install $OPTION \
-      g++ \
-      cmake \
-      libboost-all-dev \
-      libevent-dev \
-      libdouble-conversion-dev \
-      libgoogle-glog-dev \
-      libgflags-dev \
-      libiberty-dev \
-      liblz4-dev \
-      liblzma-dev \
-      libsnappy-dev \
-      make \
-      zlib1g-dev \
-      binutils-dev \
-      libjemalloc-dev \
-      libssl-dev \
-      pkg-config
-    ret=$?;[[ $ret -ne 0 ]] && return $ret
+    if [[ "$OS_BASEDISTRO" == "fedora" ]]; then
+      $SUDO $INSTALLER install $OPTION \
+        gcc-c++ \
+        make \
+        boost-devel \
+        libevent-devel \
+        double-conversion-devel \
+        glog-devel \
+        gflags-devel \
+        lz4-devel \
+        zlib-devel\
+        openssl-devel \
+        binutils-devel
+      ret=$?;[[ $ret -ne 0 ]] && return $ret
+    elif [[ $OS_DISTRO == "ubuntu" ]]; then
+      $SUDO $INSTALLER install $OPTION \
+        g++ \
+        cmake \
+        libboost-all-dev \
+        libevent-dev \
+        libdouble-conversion-dev \
+        libgoogle-glog-dev \
+        libgflags-dev \
+        libiberty-dev \
+        liblz4-dev \
+        liblzma-dev \
+        libsnappy-dev \
+        make \
+        zlib1g-dev \
+        binutils-dev \
+        libjemalloc-dev \
+        libssl-dev \
+        pkg-config
+      ret=$?;[[ $ret -ne 0 ]] && return $ret
+    fi
 
     pushd /tmp
 
     if [ $debug -eq 1 ]; then
       # For advanced debugging options
-      $SUDO apt-get install $OPTION \
+      $SUDO $INSTALLER install $OPTION \
         libunwind8-dev \
         libelf-dev \
         libdwarf-dev
@@ -94,9 +110,32 @@ install_fb_folly_from_source(){
     git clone https://github.com/facebook/folly.git
     ret=$?;[[ $ret -ne 0 ]] && popd && return $ret
     cd folly
-    git checkout -f v2019.11.11.00
+    if [[ "$OS_BASEDISTRO" == "fedora" ]]; then
+      git checkout -f v2019.06.17.00
+      echo 'diff --git a/build/fbcode_builder/CMake/FindGflags.cmake b/build/fbcode_builder/CMake/FindGflags.cmake' > patch.diff
+      echo 'index 246ceac..3b96716 100644' >> patch.diff
+      echo '--- a/build/fbcode_builder/CMake/FindGflags.cmake' >> patch.diff
+      echo '+++ b/build/fbcode_builder/CMake/FindGflags.cmake' >> patch.diff
+      echo '@@ -34,6 +34,9 @@ IF (LIBGFLAGS_INCLUDE_DIR)' >> patch.diff
+      echo ' ENDIF ()' >> patch.diff
+      echo '' >> patch.diff
+      echo ' find_package(gflags CONFIG QUIET)' >> patch.diff
+      echo '+get_filename_component (_LIB_PATH "${gflags_CONFIG}/../../../" ABSOLUTE)' >> patch.diff
+      echo '+unset(gflags_LIBRARIES)' >> patch.diff
+      echo '+find_library(gflags_LIBRARIES gflags PATHS ${_LIB_PATH})' >> patch.diff
+      echo ' if (gflags_FOUND)' >> patch.diff
+      echo '   if (NOT Gflags_FIND_QUIETLY)' >> patch.diff
+      echo '     message(STATUS "Found gflags from package config ${gflags_CONFIG}")' >> patch.diff
+      git apply patch.diff
+    else
+        git checkout -f v2019.11.11.00
+    fi
     mkdir _build && cd _build
-    cmake  ..
+    if [[ "$OS_BASEDISTRO" == "fedora" ]]; then
+      cmake3  ..
+    else
+      cmake  ..
+    fi
     ret=$?;[[ $ret -ne 0 ]] && popd && return $ret
     make -j $(nproc)
     ret=$?;[[ $ret -ne 0 ]] && popd && return $ret

build/scripts/build_helper.spgw

@@ -159,7 +159,6 @@ check_install_spgwc_deps() {
       automake \
       bison \
       $CMAKE \
-      doxygen \
       flex \
       gdb \
       git"
@@ -213,7 +212,7 @@ check_install_spgwc_deps() {
       libxml2-devel \
       openssl \
       check \
-      python \
+      python2 \
       pkgconfig"
   else
     echo_fatal "$OS_DISTRO is not a supported distribution."
@@ -436,7 +435,7 @@ check_install_spgwu_deps() {
       libxml2-devel \
       openssl \
       check \
-      python \
+      python2 \
       pkgconfig"
   else
     echo_fatal "$OS_DISTRO is not a supported distribution."

ci-scripts/Dockerfile.centos8

+#/*
+# * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+# * contributor license agreements.  See the NOTICE file distributed with
+# * this work for additional information regarding copyright ownership.
+# * The OpenAirInterface Software Alliance licenses this file to You under
+# * the OAI Public License, Version 1.1  (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.openairinterface.org/?page_id=698
+# *
+# * 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.
+# *-------------------------------------------------------------------------------
+# * For more information about the OpenAirInterface (OAI) Software Alliance:
+# *      contact@openairinterface.org
+# */
+#---------------------------------------------------------------------
+#
+# Dockerfile for the Open-Air-Interface SPGW-U-TINY service
+#   Valid for CentOS 8
+#
+#---------------------------------------------------------------------
+
+#---------------------------------------------------------------------
+# BUILDER IMAGE
+#---------------------------------------------------------------------
+FROM centos:8 as oai-spgwu-tiny-builder
+
+ARG EURECOM_PROXY
+ARG BUILD_FOR_CI
+ARG CI_SRC_BRANCH
+ARG CI_SRC_COMMIT
+ARG CI_DEST_BRANCH
+
+RUN yum update -y \
+  && yum install epel-release -y \
+  && yum install dnf-plugins-core -y \
+  && yum config-manager --set-enabled PowerTools \
+  && yum install -y \
+    psmisc \
+    git \
+  && yum clean all -y \
+  && rm -rf /var/cache/yum
+
+# Some GIT configuration command quite useful
+RUN /bin/bash -c "if [[ -v EURECOM_PROXY ]]; then git config --global http.proxy $EURECOM_PROXY; fi"
+RUN git config --global https.postBuffer 123289600
+RUN git config --global http.sslverify false
+# In normal case, we build out of the develop branch
+RUN /bin/bash -c "if [[ -v CI_SRC_BRANCH ]]; then git clone https://github.com/OPENAIRINTERFACE/openair-spgwu-tiny.git -b $CI_SRC_BRANCH /openair-spgwu-tiny; else git clone https://github.com/OPENAIRINTERFACE/openair-spgwu-tiny.git -b develop /openair-spgwu-tiny; fi"
+# For CI, especially for Pull/Merge Requests, we build out of temp merge
+WORKDIR /openair-spgwu-tiny
+RUN /bin/bash -c "if [[ -v BUILD_FOR_CI ]]; then git config --global user.name \"OAI CI\"; fi"
+RUN /bin/bash -c "if [[ -v BUILD_FOR_CI ]]; then git config --global user.email ci@openairinterface.org; fi"
+RUN /bin/bash -c "if [[ -v BUILD_FOR_CI ]]; then git checkout -f $CI_SRC_COMMIT; fi"
+RUN /bin/bash -c "if [[ -v BUILD_FOR_CI ]]; then git merge --ff origin/$CI_DEST_BRANCH -m \"Temporary merge for CI\"; fi"
+
+# Installing and Building SPGW-C
+WORKDIR /openair-spgwu-tiny/build/scripts
+RUN ./build_spgwu --install-deps --force
+RUN ./build_spgwu --clean --build-type Release --jobs --Verbose
+
+#---------------------------------------------------------------------
+# TARGET IMAGE
+#---------------------------------------------------------------------
+FROM centos:8 as oai-spgwu-tiny
+# We install some debug tools for the moment in addition of mandatory libraries
+RUN yum update -y  \
+  && yum install epel-release -y \
+  && yum install dnf-plugins-core -y \
+  && yum config-manager --set-enabled PowerTools \
+  && yum install -y \
+    psmisc \
+    net-tools \
+    tcpdump \
+    glog \
+    double-conversion \
+    libconfig \
+    libevent \
+    boost-system \
+  && yum clean all -y \
+  && rm -rf /var/cache/yum
+
+# Copying executable and generated libraries
+WORKDIR /openair-spgwu-tiny/bin
+COPY --from=oai-spgwu-tiny-builder /openair-spgwu-tiny/build/spgw_u/build/spgwu oai_spgwu
+
+# Copying template configuration files
+# The configuration folder will be flat
+WORKDIR /openair-spgwu-tiny/etc
+COPY --from=oai-spgwu-tiny-builder /openair-spgwu-tiny/etc/spgw_u.conf .
+
+WORKDIR /openair-spgwu-tiny