Merge remote-tracking branch 'upstream/develop' into gt--amm-core-fun…

…ctionality

* upstream/develop:
  Set version to 1.10.0-rc4
  Rename 'NFT' to 'NFToken' in DisallowIncoming flags (XRPLF#4442)
  Update Docker.md (XRPLF#4432)
  Update package building scripts and images to use Conan (XRPLF#4435)
  Disable duplicate detector: (XRPLF#4438)

.gitignore

@@ -106,3 +106,6 @@ compile_commands.json
 .clangd
 packages
 pkg_out
+pkg
+CMakeUserPresets.json
+bld.rippled/

Builds/CMake/RippledRelease.cmake

@@ -2,12 +2,6 @@
  package/container targets - (optional)
 #]===================================================================]
 
-# Early return if the `containers` directory is missing,
-# e.g. when we are building a Conan package.
-if(NOT EXISTS containers)
- return()
-endif()
-
 if (is_root_project)
  if (NOT DOCKER)
  find_program (DOCKER docker)
@@ -22,27 +16,15 @@ if (is_root_project)
  message (STATUS "using [${container_label}] as build container tag...")
 
  file (MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/packages)
- if (is_linux)
- execute_process (COMMAND id -u
- OUTPUT_VARIABLE DOCKER_USER_ID
- OUTPUT_STRIP_TRAILING_WHITESPACE)
- message (STATUS "docker local user id: ${DOCKER_USER_ID}")
- execute_process (COMMAND id -g
- OUTPUT_VARIABLE DOCKER_GROUP_ID
- OUTPUT_STRIP_TRAILING_WHITESPACE)
- message (STATUS "docker local group id: ${DOCKER_GROUP_ID}")
- endif ()
- if (DOCKER_USER_ID AND DOCKER_GROUP_ID)
- set(map_user TRUE)
- endif ()
+
  #[===================================================================[
  rpm
  #]===================================================================]
  add_custom_target (rpm_container
  docker build
  --pull
  --build-arg GIT_COMMIT=${commit_hash}
- -t rippled-rpm-builder:${container_label}
+ -t rippleci/rippled-rpm-builder:${container_label}
  $<$<BOOL:${rpm_cache_from}>:--cache-from=${rpm_cache_from}>
  -f centos-builder/Dockerfile .
  WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/Builds/containers
@@ -52,12 +34,10 @@ if (is_root_project)
  SOURCES
  Builds/containers/centos-builder/Dockerfile
  Builds/containers/centos-builder/centos_setup.sh
- Builds/containers/centos-builder/extras.sh
  Builds/containers/shared/update-rippled.sh
  Builds/containers/shared/update_sources.sh
  Builds/containers/shared/rippled.service
  Builds/containers/shared/rippled-reporting.service
- Builds/containers/shared/build_deps.sh
  Builds/containers/packaging/rpm/rippled.spec
  Builds/containers/packaging/rpm/build_rpm.sh
  Builds/containers/packaging/rpm/50-rippled.preset
@@ -69,8 +49,7 @@ if (is_root_project)
  docker run
  -v ${CMAKE_CURRENT_SOURCE_DIR}:/opt/rippled_bld/pkg/rippled
  -v ${CMAKE_CURRENT_BINARY_DIR}/packages:/opt/rippled_bld/pkg/out
- "$<$<BOOL:${map_user}>:--volume=/etc/passwd:/etc/passwd;--volume=/etc/group:/etc/group;--user=${DOCKER_USER_ID}:${DOCKER_GROUP_ID}>"
- -t rippled-rpm-builder:${container_label}
+ -t rippleci/rippled-rpm-builder:${container_label}
  /bin/bash -c "cp -fpu rippled/Builds/containers/packaging/rpm/build_rpm.sh . && ./build_rpm.sh"
  VERBATIM
  USES_TERMINAL
@@ -92,9 +71,9 @@ if (is_root_project)
  add_custom_target (dpkg_container
  docker build
  --pull
- --build-arg DIST_TAG=18.04
+ --build-arg DIST_TAG=20.04
  --build-arg GIT_COMMIT=${commit_hash}
- -t rippled-dpkg-builder:${container_label}
+ -t rippleci/rippled-dpkg-builder:${container_label}
  $<$<BOOL:${dpkg_cache_from}>:--cache-from=${dpkg_cache_from}>
  -f ubuntu-builder/Dockerfile .
  WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/Builds/containers
@@ -128,10 +107,8 @@ if (is_root_project)
  Builds/containers/ubuntu-builder/ubuntu_setup.sh
  bin/getRippledInfo
  Builds/containers/shared/install_cmake.sh
- Builds/containers/shared/install_boost.sh
  Builds/containers/shared/update-rippled.sh
  Builds/containers/shared/update_sources.sh
- Builds/containers/shared/build_deps.sh
  Builds/containers/shared/rippled.service
  Builds/containers/shared/rippled-reporting.service
  Builds/containers/shared/rippled-logrotate
@@ -142,8 +119,7 @@ if (is_root_project)
  docker run
  -v ${CMAKE_CURRENT_SOURCE_DIR}:/opt/rippled_bld/pkg/rippled
  -v ${CMAKE_CURRENT_BINARY_DIR}/packages:/opt/rippled_bld/pkg/out
- "$<$<BOOL:${map_user}>:--volume=/etc/passwd:/etc/passwd;--volume=/etc/group:/etc/group;--user=${DOCKER_USER_ID}:${DOCKER_GROUP_ID}>"
- -t rippled-dpkg-builder:${container_label}
+ -t rippleci/rippled-dpkg-builder:${container_label}
  /bin/bash -c "cp -fpu rippled/Builds/containers/packaging/dpkg/build_dpkg.sh . && ./build_dpkg.sh"
  VERBATIM
  USES_TERMINAL
@@ -183,7 +159,7 @@ if (is_root_project)
  add_custom_target (ci_container
  docker build
  --pull
- --build-arg DIST_TAG=18.04
+ --build-arg DIST_TAG=20.04
  --build-arg GIT_COMMIT=${commit_hash}
  --build-arg CI_USE=true
  -t rippled-ci-builder:${container_label}
@@ -196,7 +172,6 @@ if (is_root_project)
  SOURCES
  Builds/containers/ubuntu-builder/Dockerfile
  Builds/containers/ubuntu-builder/ubuntu_setup.sh
- Builds/containers/shared/build_deps.sh
  )
  exclude_from_default (ci_container)
  else ()

Builds/containers/centos-builder/Dockerfile

@@ -1,43 +1,26 @@
-FROM centos:7
+FROM rippleci/centos:7
 ARG GIT_COMMIT=unknown
 ARG CI_USE=false
 
 LABEL git-commit=$GIT_COMMIT
 
 COPY centos-builder/centos_setup.sh /tmp/
-COPY shared/build_deps.sh /tmp/
 COPY shared/install_cmake.sh /tmp/
-COPY centos-builder/extras.sh /tmp/
-COPY shared/install_boost.sh /tmp/
 RUN chmod +x /tmp/centos_setup.sh && \
- chmod +x /tmp/build_deps.sh && \
- chmod +x /tmp/install_boost.sh && \
- chmod +x /tmp/install_cmake.sh && \
- chmod +x /tmp/extras.sh
+ chmod +x /tmp/install_cmake.sh
 RUN /tmp/centos_setup.sh
 
-RUN /tmp/install_cmake.sh 3.16.1 /opt/local/cmake-3.16
+RUN /tmp/install_cmake.sh 3.16.3 /opt/local/cmake-3.16
 RUN ln -s /opt/local/cmake-3.16 /opt/local/cmake
 ENV PATH="/opt/local/cmake/bin:$PATH"
-# also install min supported cmake for testing
-RUN if [ "${CI_USE}" = true ] ; then /tmp/install_cmake.sh 3.9.0 /opt/local/cmake-3.9; fi
+# TODO: Install latest CMake for testing
+RUN if [ "${CI_USE}" = true ] ; then /tmp/install_cmake.sh 3.16.3 /opt/local/cmake-3.16; fi
 
-RUN source scl_source enable devtoolset-7 python27 && \
- /tmp/build_deps.sh
-ENV BOOST_ROOT="/opt/local/boost/_INSTALLED_"
-ENV PLANTUML_JAR="/opt/plantuml/plantuml.jar"
-ENV OPENSSL_ROOT="/opt/local/openssl"
-ENV GDB_ROOT="/opt/local/gdb"
-RUN source scl_source enable devtoolset-7 python27 && \
- /tmp/extras.sh
-
-# prep files for package building
 RUN mkdir -m 777 -p /opt/rippled_bld/pkg
+
 WORKDIR /opt/rippled_bld/pkg
 RUN mkdir -m 777 ./rpmbuild
 RUN mkdir -m 777 ./rpmbuild/{BUILD,RPMS,SOURCES,SPECS,SRPMS}
 
 COPY packaging/rpm/build_rpm.sh ./
 CMD ./build_rpm.sh
-
-

Builds/containers/centos-builder/centos_setup.sh

@@ -7,31 +7,16 @@ yum -y upgrade
 yum -y update
 yum -y install epel-release centos-release-scl
 yum -y install \
- wget curl time gcc-c++ time yum-utils autoconf automake pkgconfig libtool \
+ wget curl time gcc-c++ yum-utils autoconf automake pkgconfig libtool \
  libstdc++-static rpm-build gnupg which make cmake \
- devtoolset-7 devtoolset-7-gdb devtoolset-7-libasan-devel devtoolset-7-libtsan-devel devtoolset-7-libubsan-devel \
- devtoolset-8 devtoolset-8-gdb devtoolset-8-binutils devtoolset-8-libstdc++-devel \
- devtoolset-8-libasan-devel devtoolset-8-libtsan-devel devtoolset-8-libubsan-devel devtoolset-8-liblsan-devel \
+ devtoolset-11 devtoolset-11-gdb devtoolset-11-binutils devtoolset-11-libstdc++-devel \
+ devtoolset-11-libasan-devel devtoolset-11-libtsan-devel devtoolset-11-libubsan-devel devtoolset-11-liblsan-devel \
  flex flex-devel bison bison-devel parallel \
  ncurses ncurses-devel ncurses-libs graphviz graphviz-devel \
  lzip p7zip bzip2 bzip2-devel lzma-sdk lzma-sdk-devel xz-devel \
  zlib zlib-devel zlib-static texinfo openssl openssl-static \
  jemalloc jemalloc-devel \
  libicu-devel htop \
- python27-python rh-python35-python \
- python-devel python27-python-devel rh-python35-python-devel \
- python27 rh-python35 \
+ rh-python38 \
  ninja-build git svn \
- swig perl-Digest-MD5 python2-pip
-
-if [ "${CI_USE}" = true ] ; then
- # TODO need permanent link
- yum -y install ftp://ftp.pbone.net/mirror/archive.fedoraproject.org/fedora-secondary/updates/26/i386/Packages/p/python2-six-1.10.0-9.fc26.noarch.rpm
-
- yum -y install \
- llvm-toolset-7 llvm-toolset-7-runtime llvm-toolset-7-build llvm-toolset-7-clang \
- llvm-toolset-7-clang-analyzer llvm-toolset-7-clang-devel llvm-toolset-7-clang-libs \
- llvm-toolset-7-clang-tools-extra llvm-toolset-7-compiler-rt llvm-toolset-7-lldb \
- llvm-toolset-7-lldb-devel llvm-toolset-7-python-lldb
-
-fi
+ swig perl-Digest-MD5