From 176abe79a084f194c5cd4920a01fc146a1394cd2 Mon Sep 17 00:00:00 2001
From: apporc <appleorchard2000@gmail.com>
Date: Wed, 24 Jan 2024 19:30:12 +0800
Subject: [PATCH] update chronicle and leap

---
 .github/workflows/chronicle.yml |  9 ++++-----
 .github/workflows/leap.yml      |  9 ++++-----
 chronicle/Dockerfile            |  2 +-
 leap/Dockerfile                 | 26 +++++++++++++++++++++-----
 4 files changed, 30 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/chronicle.yml b/.github/workflows/chronicle.yml
index 7896483..debddf5 100644
--- a/.github/workflows/chronicle.yml
+++ b/.github/workflows/chronicle.yml
@@ -4,13 +4,13 @@ on:
   workflow_dispatch:
     inputs:
       version:
-        description: 'Version (tag to build, e.g. v2.2)'
+        description: "Version (tag to build, e.g. v3.3)"
         required: true
-        default: 'v2.2'
+        default: "v3.3"
       repo:
-        description: 'Git repository to pull from'
+        description: "Git repository to pull from"
         required: true
-        default: 'https://github.com/EOSChronicleProject/eos-chronicle.git'
+        default: "https://github.com/EOSChronicleProject/eos-chronicle.git"
 
 env:
   REGISTRY: ghcr.io
@@ -20,7 +20,6 @@ jobs:
   docker:
     runs-on: ubuntu-latest
     steps:
-
       - name: Checkout
         uses: actions/checkout@v2
 
diff --git a/.github/workflows/leap.yml b/.github/workflows/leap.yml
index a434854..8053eed 100644
--- a/.github/workflows/leap.yml
+++ b/.github/workflows/leap.yml
@@ -4,13 +4,13 @@ on:
   workflow_dispatch:
     inputs:
       version:
-        description: 'Version (tag to build, e.g. v3.1.2)'
+        description: "Version (tag to build, e.g. v3.1.2)"
         required: true
-        default: 'v3.1.2'
+        default: "v5.0.0"
       repo:
-        description: 'Git repository to pull from'
+        description: "Git repository to pull from"
         required: true
-        default: 'https://github.com/AntelopeIO/leap.git'
+        default: "https://github.com/AntelopeIO/leap.git"
 
 env:
   REGISTRY: ghcr.io
@@ -20,7 +20,6 @@ jobs:
   docker:
     runs-on: ubuntu-latest
     steps:
-
       - name: Checkout
         uses: actions/checkout@v2
 
diff --git a/chronicle/Dockerfile b/chronicle/Dockerfile
index 163115d..60ed19d 100644
--- a/chronicle/Dockerfile
+++ b/chronicle/Dockerfile
@@ -8,7 +8,7 @@ RUN apt-get update \
     && rm -rf /var/lib/apt/lists/*
 
 # setup build time variables
-ARG CHRONICLE_VERSION=v2.2
+ARG CHRONICLE_VERSION=v3.3
 ARG CHRONICLE_REPOSITORY=https://github.com/EOSChronicleProject/eos-chronicle.git
 
 # build and install chronicle
diff --git a/leap/Dockerfile b/leap/Dockerfile
index c1049fe..76464e3 100644
--- a/leap/Dockerfile
+++ b/leap/Dockerfile
@@ -8,15 +8,31 @@ RUN apt-get update \
     && rm -rf /var/lib/apt/lists/*
 
 # setup build time variables
-ARG LEAP_VERSION=v3.1.2
+ARG LEAP_VERSION=v5.0.0
 ARG LEAP_REPOSITORY=https://github.com/AntelopeIO/leap.git
 
 # build and install leap
 WORKDIR /tmp
 RUN git clone --branch $LEAP_VERSION --depth 1 $LEAP_REPOSITORY . \
   && git submodule update --init --recursive
-RUN ./scripts/install_deps.sh
-RUN ./scripts/pinned_build.sh /tmp/leap /leap $(nproc)
+RUN apt-get update \
+    && DEBIAN_FRONTEND="noninteractive" apt-get install -y --no-install-recommends \
+        build-essential \
+        cmake \
+        git \
+        libcurl4-openssl-dev \
+        libgmp-dev \
+        llvm-11-dev \
+        python3-numpy \
+        file \
+        zlib1g-dev \
+    && rm -rf /var/lib/apt/lists/*
+RUN mkdir -p build \
+    && cd build \
+    ## on Ubuntu 22, the default gcc version is 11, using the default compiler is fine
+    && cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH=/usr/lib/llvm-11 .. \
+    && make -j "$(nproc)" \
+    && cd /tmp
 
 # runtime image
 FROM ubuntu:22.04
@@ -27,9 +43,9 @@ RUN apt-get update && DEBIAN_FRONTEND="noninteractive" apt-get install -y --no-i
   && rm -rf /var/lib/apt/lists/*
 
 # copy leap install
-COPY --from=build-stage /leap /leap
+COPY --from=build-stage /tmp/build /leap
 
 # setup runtime env
-ARG LEAP_VERSION=v3.1.2
+ARG LEAP_VERSION=v5.0.0
 ENV LEAP_VERSION=$LEAP_VERSION
 ENV PATH="/leap/bin:${PATH}"