Merge branch 'beatrice' into 'master'

Merge beatrice to master 2022-06 See merge request PBSA/peerplays!131
peerplays-network · Jun 27, 2022 · 611a630 · 611a630
2 parents 6a59d9e + d234c3a
commit 611a630
Show file tree

Hide file tree

Showing 28 changed files with 581 additions and 141 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -8,8 +8,9 @@ include:
 stages:
   - build
   - test
+  - dockerize
 
-build:
+build-mainnet:
   stage: build
   script:
     - rm -rf .git/modules/docs .git/modules/libraries/fc ./docs ./libraries/fc
@@ -29,29 +30,96 @@ build:
   tags:
     - builder
 
-dockerize:
-  stage: build
+test-mainnet:
+  stage: test
+  dependencies:
+    - build-mainnet
+  script:
+    - ./build/libraries/fc/tests/all_tests
+    - ./build/tests/betting_test --log_level=message
+    - ./build/tests/chain_test --log_level=message
+    - ./build/tests/cli_test --log_level=message
+  tags:
+    - builder
+
+dockerize-mainnet:
+  stage: dockerize
+  dependencies:
+    - test-mainnet
   variables:
-    IMAGE: $CI_REGISTRY_IMAGE/$CI_COMMIT_REF_SLUG:$CI_COMMIT_SHA
+    IMAGE: $CI_REGISTRY_IMAGE/mainnet/$CI_COMMIT_REF_SLUG:$CI_COMMIT_SHA
   before_script:
     - docker info
     - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
   script:
-    - docker build -t $IMAGE .
+    - docker build --no-cache -t $IMAGE .
     - docker push $IMAGE
+  after_script:
+    - docker rmi $IMAGE
+  tags:
+    - builder
+  when:
+    manual
+  timeout:
+    3h
+
+build-testnet:
+  stage: build
+  script:
+    - rm -rf .git/modules/docs .git/modules/libraries/fc ./docs ./libraries/fc
+    - git submodule sync
+    - git submodule update --init --recursive
+    - rm -rf build
+    - mkdir build
+    - cd build
+    - cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_PEERPLAYS_TESTNET=1 ..
+    - make -j$(nproc)
+  artifacts:
+    untracked: true
+    paths:
+      - build/libraries/
+      - build/programs/
+      - build/tests/
   tags:
     - builder
-  when: manual
-  timeout: 3h
+  when:
+    manual
+  timeout:
+    3h
 
-test:
+test-testnet:
   stage: test
   dependencies:
-    - build
+    - build-testnet
   script:
     - ./build/libraries/fc/tests/all_tests
     - ./build/tests/betting_test --log_level=message
     - ./build/tests/chain_test --log_level=message
     - ./build/tests/cli_test --log_level=message
   tags:
     - builder
+  when:
+    manual
+  timeout:
+    1h
+
+dockerize-testnet:
+  stage: dockerize
+  dependencies:
+    - test-testnet
+  variables:
+    IMAGE: $CI_REGISTRY_IMAGE/testnet/$CI_COMMIT_REF_SLUG:$CI_COMMIT_SHA
+  before_script:
+    - docker info
+    - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
+  script:
+    - docker build --no-cache -t $IMAGE .
+    - docker push $IMAGE
+  after_script:
+    - docker rmi $IMAGE
+  tags:
+    - builder
+  when:
+    manual
+  timeout:
+    3h
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -22,6 +22,37 @@ endif()
 
 list( APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules" )
 
+function(get_linux_lsb_release_information)
+    find_program(LSB_RELEASE_EXEC lsb_release)
+    if(NOT LSB_RELEASE_EXEC)
+        message(FATAL_ERROR "Could not detect lsb_release executable, can not gather required information")
+    endif()
+
+    execute_process(COMMAND "${LSB_RELEASE_EXEC}" --short --id OUTPUT_VARIABLE LSB_RELEASE_ID_SHORT OUTPUT_STRIP_TRAILING_WHITESPACE)
+    execute_process(COMMAND "${LSB_RELEASE_EXEC}" --short --release OUTPUT_VARIABLE LSB_RELEASE_VERSION_SHORT OUTPUT_STRIP_TRAILING_WHITESPACE)
+    execute_process(COMMAND "${LSB_RELEASE_EXEC}" --short --codename OUTPUT_VARIABLE LSB_RELEASE_CODENAME_SHORT OUTPUT_STRIP_TRAILING_WHITESPACE)
+
+    set(LSB_RELEASE_ID_SHORT "${LSB_RELEASE_ID_SHORT}" PARENT_SCOPE)
+    set(LSB_RELEASE_VERSION_SHORT "${LSB_RELEASE_VERSION_SHORT}" PARENT_SCOPE)
+    set(LSB_RELEASE_CODENAME_SHORT "${LSB_RELEASE_CODENAME_SHORT}" PARENT_SCOPE)
+endfunction()
+
+if(CMAKE_SYSTEM_NAME MATCHES "Linux")
+        find_package(cppzmq)
+        target_link_libraries(cppzmq)
+
+	get_linux_lsb_release_information()
+	message(STATUS "Linux ${LSB_RELEASE_ID_SHORT} ${LSB_RELEASE_VERSION_SHORT} ${LSB_RELEASE_CODENAME_SHORT}")
+	string(REGEX MATCHALL "([0-9]+)" arg_list ${LSB_RELEASE_VERSION_SHORT})
+	list( LENGTH arg_list listlen )
+	if (NOT listlen)
+		message(FATAL_ERROR "Could not detect Ubuntu version")
+	endif()
+	list(GET arg_list 0 output)
+	message("Ubuntu version is: ${output}")
+	add_definitions(-DPEERPLAYS_UBUNTU_VERSION=${output})
+endif()
+
 # function to help with cUrl
 macro(FIND_CURL)
    if (NOT WIN32 AND NOT APPLE AND CURL_STATICLIB)

diff --git a/Dockerfile b/Dockerfile
@@ -1,5 +1,5 @@
 FROM ubuntu:20.04
-MAINTAINER PeerPlays Blockchain Standards Association
+MAINTAINER Peerplays Blockchain Standards Association
 
 #===============================================================================
 # Ubuntu setup
@@ -23,13 +23,12 @@ RUN \
       libbz2-dev \
       libcurl4-openssl-dev \
       libncurses-dev \
-      libreadline-dev \
       libsnappy-dev \
       libssl-dev \
       libtool \
       libzip-dev \
-      libzmq3-dev \
       locales \
+      lsb-release \
       mc \
       nano \
       net-tools \
@@ -40,6 +39,7 @@ RUN \
       python3 \
       python3-jinja2 \
       sudo \
+      systemd-coredump \
       wget
 
 ENV HOME /home/peerplays
@@ -53,6 +53,38 @@ RUN echo 'peerplays:peerplays' | chpasswd
 # SSH
 EXPOSE 22
 
+#===============================================================================
+# libzmq setup
+#===============================================================================
+
+WORKDIR /home/peerplays/
+
+RUN \
+    wget https://github.com/zeromq/libzmq/archive/refs/tags/v4.3.4.zip && \
+    unzip v4.3.4.zip && \
+    cd libzmq-4.3.4 && \
+    mkdir build && \
+    cd build && \
+    cmake .. && \
+    make -j$(nproc) install && \
+    ldconfig
+
+#===============================================================================
+# cppzmq setup
+#===============================================================================
+
+WORKDIR /home/peerplays/
+
+RUN \
+    wget https://github.com/zeromq/cppzmq/archive/refs/tags/v4.8.1.zip && \
+    unzip v4.8.1.zip && \
+    cd cppzmq-4.8.1 && \
+    mkdir build && \
+    cd build && \
+    cmake .. && \
+    make -j$(nproc) install && \
+    ldconfig
+
 #===============================================================================
 # Peerplays setup
 #===============================================================================

diff --git a/Dockerfile.18.04 b/Dockerfile.18.04
@@ -0,0 +1,159 @@
+FROM ubuntu:18.04
+MAINTAINER Peerplays Blockchain Standards Association
+
+#===============================================================================
+# Ubuntu setup
+#===============================================================================
+
+RUN \
+    apt-get update -y && \
+      DEBIAN_FRONTEND=noninteractive apt-get install -y \
+      apt-utils \
+      autoconf \
+      bash \
+      build-essential \
+      ca-certificates \
+      dnsutils \
+      doxygen \
+      expect \
+      git \
+      graphviz \
+      libbz2-dev \
+      libcurl4-openssl-dev \
+      libncurses-dev \
+      libsnappy-dev \
+      libssl-dev \
+      libtool \
+      libzip-dev \
+      locales \
+      lsb-release \
+      mc \
+      nano \
+      net-tools \
+      ntp \
+      openssh-server \
+      pkg-config \
+      perl \
+      python3 \
+      python3-jinja2 \
+      sudo \
+      systemd-coredump \
+      wget
+
+ENV HOME /home/peerplays
+RUN useradd -rm -d /home/peerplays -s /bin/bash -g root -G sudo -u 1000 peerplays
+RUN echo "peerplays  ALL=(ALL) NOPASSWD:ALL" | sudo tee /etc/sudoers.d/peerplays
+RUN chmod 440 /etc/sudoers.d/peerplays
+
+RUN service ssh start
+RUN echo 'peerplays:peerplays' | chpasswd
+
+# SSH
+EXPOSE 22
+
+#===============================================================================
+# Boost setup
+#===============================================================================
+
+WORKDIR /home/peerplays/
+
+RUN \
+    wget -c 'http://sourceforge.net/projects/boost/files/boost/1.67.0/boost_1_67_0.tar.bz2/download' -O boost_1_67_0.tar.bz2 && \
+    tar xjf boost_1_67_0.tar.bz2 && \
+    cd boost_1_67_0/ && \
+    ./bootstrap.sh && \
+    ./b2 install
+
+#===============================================================================
+# cmake setup
+#===============================================================================
+
+WORKDIR /home/peerplays/
+
+RUN \
+    wget -c 'https://cmake.org/files/v3.23/cmake-3.23.1-linux-x86_64.sh' -O cmake-3.23.1-linux-x86_64.sh && \
+    chmod 755 ./cmake-3.23.1-linux-x86_64.sh && \
+    ./cmake-3.23.1-linux-x86_64.sh --prefix=/usr/ --skip-license && \
+    cmake --version
+
+#===============================================================================
+# libzmq setup
+#===============================================================================
+
+WORKDIR /home/peerplays/
+
+RUN \
+    wget https://github.com/zeromq/libzmq/archive/refs/tags/v4.3.4.zip && \
+    unzip v4.3.4.zip && \
+    cd libzmq-4.3.4 && \
+    mkdir build && \
+    cd build && \
+    cmake .. && \
+    make -j$(nproc) install && \
+    ldconfig
+
+#===============================================================================
+# cppzmq setup
+#===============================================================================
+
+WORKDIR /home/peerplays/
+
+RUN \
+    wget https://github.com/zeromq/cppzmq/archive/refs/tags/v4.8.1.zip && \
+    unzip v4.8.1.zip && \
+    cd cppzmq-4.8.1 && \
+    mkdir build && \
+    cd build && \
+    cmake .. && \
+    make -j$(nproc) install && \
+    ldconfig
+
+#===============================================================================
+# Peerplays setup
+#===============================================================================
+
+WORKDIR /home/peerplays/
+
+## Clone Peerplays
+#RUN \
+#    git clone https://gitlab.com/PBSA/peerplays.git && \
+#    cd peerplays && \
+#    git checkout develop && \
+#    git submodule update --init --recursive && \
+#    git branch --show-current && \
+#    git log --oneline -n 5
+
+# Add local source
+ADD . peerplays
+
+# Configure Peerplays
+RUN \
+    cd peerplays && \
+    mkdir build && \
+    cd build && \
+    cmake -DCMAKE_BUILD_TYPE=Release ..
+
+# Build Peerplays
+RUN \
+    cd peerplays/build && \
+    make -j$(nproc) cli_wallet witness_node
+
+WORKDIR /home/peerplays/peerplays-network
+
+# Setup Peerplays runimage
+RUN \
+    ln -s /home/peerplays/peerplays/build/programs/cli_wallet/cli_wallet ./ && \
+    ln -s /home/peerplays/peerplays/build/programs/witness_node/witness_node ./
+
+RUN ./witness_node --create-genesis-json genesis.json && \
+    rm genesis.json
+
+RUN chown peerplays:root -R /home/peerplays/peerplays-network
+
+# Peerplays RPC
+EXPOSE 8090
+# Peerplays P2P:
+EXPOSE 9777
+
+# Peerplays
+CMD ["./witness_node", "-d", "./witness_node_data_dir"]