Skip to content

Commit

Permalink
update chronicle and leap
Browse files Browse the repository at this point in the history
  • Loading branch information
apporc committed Jan 25, 2024
1 parent ec6e9ad commit 176abe7
Show file tree
Hide file tree
Showing 4 changed files with 30 additions and 16 deletions.
9 changes: 4 additions & 5 deletions .github/workflows/chronicle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -20,7 +20,6 @@ jobs:
docker:
runs-on: ubuntu-latest
steps:

- name: Checkout
uses: actions/checkout@v2

Expand Down
9 changes: 4 additions & 5 deletions .github/workflows/leap.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -20,7 +20,6 @@ jobs:
docker:
runs-on: ubuntu-latest
steps:

- name: Checkout
uses: actions/checkout@v2

Expand Down
2 changes: 1 addition & 1 deletion chronicle/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
26 changes: 21 additions & 5 deletions leap/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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}"

0 comments on commit 176abe7

Please sign in to comment.