Feature/docker compose

.dockerignore

@@ -0,0 +1,4 @@
+cmake-build-debug
+cmake-build
+docker/interopnet
+docker/mainnet

README.md

@@ -68,7 +68,7 @@ bootstrap=/dns4/bootstrap-1.interop.fildev.network/tcp/1347/p2p/12D3KooWFYS1f31z
 
 Start node
 ```sh
-fuhon-node --repo fuhon-interopnet --genesis cpp-filecoin/core/node/main/interopnet.car
+fuhon-node --repo fuhon-interopnet --genesis docker/interopnet/genesis.car
 # you can omit --genesis flag after first run
 fuhon-node --repo fuhon-interopnet
 ```
@@ -97,7 +97,7 @@ bootstrap=/dns4/node.glif.io/tcp/1235/p2p/12D3KooWBF8cpp65hp2u9LK5mh19x67ftAam84
 
 Start node (first run may take some time)
 ```sh
-fuhon-node --repo fuhon-mainnet --genesis cpp-filecoin/core/node/main/mainnet.car
+fuhon-node --repo fuhon-mainnet --genesis cpp-filecoin/core/docker/mainnet/genesis.car
 ```
 
 ### Docker-compose example

core/miner/main/main.cpp

@@ -532,6 +532,11 @@ namespace fc {
         api::makeRpc(*mapi,
                      std::bind(mapi->AuthVerify, std::placeholders::_1)));
     auto mroutes{std::make_shared<api::Routes>()};
+    mroutes->emplace("/health", [](auto &) {
+      api::http::response<api::http::string_body> res;
+      res.body() = "{\"status\":\"UP\"}";
+      return api::WrapperResponse{std::move(res)};
+    });
 
     mroutes->insert({"/remote",
                      api::makeAuthRoute(

docker/Dockerfile

@@ -1,18 +1,43 @@
 FROM ubuntu:20.04 AS base
 RUN rm -f /etc/apt/apt.conf.d/docker-clean
-RUN --mount=type=cache,target=/var/cache/apt apt-get update
+ARG DEBIAN_FRONTEND=noninteractive
+RUN --mount=type=cache,target=/var/cache/apt,sharing=shared apt-get update && apt-get install -y --no-install-recommends hwloc ocl-icd-* curl \
+    && rm -rf /var/lib/apt/lists/*
+RUN groupadd --gid 1000 fuhon && useradd --uid 1000 --gid fuhon fuhon
 
 FROM base AS build
-RUN --mount=type=cache,target=/var/cache/apt DEBIAN_FRONTEND="noninteractive" apt-get install -y --no-install-recommends git curl rsync make ninja-build clang-9 jq python3-pip python-setuptools pkg-config ocl-icd-* opencl-headers libhwloc-dev
+RUN --mount=type=cache,target=/var/cache/apt,sharing=shared apt-get update && apt-get install -y --no-install-recommends git curl rsync make ninja-build clang-9 jq python3-pip python-setuptools pkg-config opencl-headers libhwloc-dev zlib1g-dev libbz2-dev liblzma-dev libssl-dev libxml2-dev \
+    && rm -rf /var/lib/apt/lists/*
 RUN pip3 install scikit-build cmake requests gitpython pyyaml
 RUN curl -sL https://golang.org/dl/go1.17.3.linux-amd64.tar.gz | tar -xz -C /usr/local
 ENV PATH="$PATH:/usr/local/go/bin"
-COPY . /root/cpp-filecoin
-RUN --mount=type=cache,target=/root/.hunter/_Base/Cache CC=clang-9 CXX=clang++-9 cmake /root/cpp-filecoin -B /root/build -G Ninja -D CMAKE_BUILD_TYPE=Release -D TESTING=OFF
-RUN --mount=type=cache,target=/root/.hunter/_Base/Cache CC=clang-9 cmake --build /root/build --target fuhon-node
+COPY . /tmp/cpp-filecoin
+RUN --mount=type=cache,target=/tmp/.hunter/_Base/Cache CC=clang-9 CXX=clang++-9 cmake /tmp/cpp-filecoin -B /tmp/build -G Ninja -D CMAKE_BUILD_TYPE=Release -D TESTING=OFF
+RUN --mount=type=cache,target=/tmp/.hunter/_Base/Cache CC=clang-9 cmake --build /tmp/build --target fuhon-node fuhon-miner
 
-FROM base
-RUN --mount=type=cache,target=/var/cache/apt apt-get install -y --no-install-recommends hwloc ocl-icd-*
-COPY core/node/main/mainnet.car /root/.
-COPY --from=build /root/build/bin/fuhon-node /root/.
+FROM base AS fuhon-miner
+RUN --mount=type=cache,target=/var/cache/apt,sharing=shared apt-get update && apt-get install -y --no-install-recommends libarchive13 libssl1.1 \
+    && rm -rf /var/lib/apt/lists/*
+# cmake built libarchive has API v17, but provided version is v13 (https://github.com/libarchive/libarchive/issues/1236)
+RUN ln -s /lib/x86_64-linux-gnu/libarchive.so.13 /lib/x86_64-linux-gnu/libarchive.so.17
+COPY --from=build /tmp/build/bin/fuhon-miner /usr/local/bin
+COPY docker/miner_entrypoint.sh /
+RUN chmod +x /miner_entrypoint.sh
+USER fuhon
+RUN mkdir /tmp/fuhon
+WORKDIR /tmp/fuhon
+ENTRYPOINT ["/miner_entrypoint.sh"]
+CMD ["fuhon-miner", "--repo", "fuhon-node-repo", "--miner-repo", "fuhon-miner-repo"]
+HEALTHCHECK --interval=5s --timeout=10s CMD curl http://127.0.0.1:1234/health || exit 1
+
+FROM base AS fuhon-node
+COPY --from=build /tmp/build/bin/fuhon-node /usr/local/bin
+COPY docker/node_entrypoint.sh /
+RUN chmod +x /node_entrypoint.sh
 EXPOSE 1234 2000
+USER fuhon
+RUN mkdir /tmp/fuhon
+WORKDIR /tmp/fuhon
+ENTRYPOINT ["/node_entrypoint.sh"]
+CMD ["fuhon-node", "--config", "fuhon-node.cfg", "--genesis" ,"genesis.car", "--repo", "fuhon-node-repo"]
+HEALTHCHECK --interval=5s --timeout=10s CMD curl http://127.0.0.1:1234/health || exit 1

docker/README.md

@@ -0,0 +1,13 @@
+## Prerequisites
+
+[Docker BuildKit](https://docs.docker.com/develop/develop-images/build_enhancements/#to-enable-buildkit-builds)
+
+`DOCKER_BUILDKIT=1` environment variable must be set to enable BuildKit. 
+
+## Build
+
+To build docker image from the current context. It is advised to ignore binaries and large files from docker build context.
+
+    docker build .. -f Dockerfile
+
+There are 2 targets `fuhon-node` and `fuhon-miner` declared in Dockerfile. To build a specific target use `-t` option.

docker/docker-compose-interopnet.yml

@@ -0,0 +1,23 @@
+version: "3.0"
+
+services:
+  fuhon-node:
+    build:
+      context: ..
+      dockerfile: docker/Dockerfile
+      target: fuhon-node
+    image: fuhon-node:develop-build
+    ports:
+      - "1234:1234"
+    volumes:
+      - ./interopnet:/tmp/fuhon
+  fuhon-miner:
+    build:
+      context: ..
+      dockerfile: docker/Dockerfile
+      target: fuhon-miner
+    image: fuhon-miner:develop-build
+    volumes:
+      - ./interopnet:/tmp/fuhon
+    depends_on:
+      - fuhon-node

docker/docker-compose-mainnet.yml

@@ -0,0 +1,23 @@
+version: "3.0"
+
+services:
+  fuhon-node:
+    build:
+      context: ..
+      dockerfile: docker/Dockerfile
+      target: fuhon-node
+    image: fuhon-node:develop-build
+    ports:
+      - "1234:1234"
+    volumes:
+      - ./mainnet:/tmp/fuhon
+  fuhon-miner:
+    build:
+      context: ..
+      dockerfile: docker/Dockerfile
+      target: fuhon-miner
+    image: fuhon-miner:develop-build
+    volumes:
+      - ./mainnet:/tmp/fuhon
+    depends_on:
+      - fuhon-node

docker/interopnet/.gitignore

@@ -0,0 +1,2 @@
+fuhon-miner-repo
+fuhon-node-repo

docker/interopnet/fuhon-node.cfg

@@ -0,0 +1,5 @@
+# use interopnet profile, corresponds to "make interopnet" lotus target
+profile=interopnet
+
+bootstrap=/dns4/bootstrap-0.interop.fildev.network/tcp/1347/p2p/12D3KooWLGPq9JL1xwL6gHok7HSNxtK1Q5kyfg4Hk69ifRPghn4i
+bootstrap=/dns4/bootstrap-1.interop.fildev.network/tcp/1347/p2p/12D3KooWFYS1f31zafv8mqqYu8U3hEqYvaZ6avWzYU3BmZdpyH3h

docker/mainnet/.gitignore

@@ -0,0 +1,2 @@
+fuhon-miner-repo
+fuhon-node-repo

docker/mainnet/fuhon-node.cfg

@@ -0,0 +1,18 @@
+# use mainnet profile
+profile=mainnet
+
+bootstrap=/dns4/bootstrap-0.mainnet.filops.net/tcp/1347/p2p/12D3KooWCVe8MmsEMes2FzgTpt9fXtmCY7wrq91GRiaC8PHSCCBj
+bootstrap=/dns4/bootstrap-1.mainnet.filops.net/tcp/1347/p2p/12D3KooWCwevHg1yLCvktf2nvLu7L9894mcrJR4MsBCcm4syShVc
+bootstrap=/dns4/bootstrap-2.mainnet.filops.net/tcp/1347/p2p/12D3KooWEWVwHGn2yR36gKLozmb4YjDJGerotAPGxmdWZx2nxMC4
+bootstrap=/dns4/bootstrap-3.mainnet.filops.net/tcp/1347/p2p/12D3KooWKhgq8c7NQ9iGjbyK7v7phXvG6492HQfiDaGHLHLQjk7R
+bootstrap=/dns4/bootstrap-4.mainnet.filops.net/tcp/1347/p2p/12D3KooWL6PsFNPhYftrJzGgF5U18hFoaVhfGk7xwzD8yVrHJ3Uc
+bootstrap=/dns4/bootstrap-5.mainnet.filops.net/tcp/1347/p2p/12D3KooWLFynvDQiUpXoHroV1YxKHhPJgysQGH2k3ZGwtWzR4dFH
+bootstrap=/dns4/bootstrap-6.mainnet.filops.net/tcp/1347/p2p/12D3KooWP5MwCiqdMETF9ub1P3MbCvQCcfconnYHbWg6sUJcDRQQ
+bootstrap=/dns4/bootstrap-7.mainnet.filops.net/tcp/1347/p2p/12D3KooWRs3aY1p3juFjPy8gPN95PEQChm2QKGUCAdcDCC4EBMKf
+bootstrap=/dns4/bootstrap-8.mainnet.filops.net/tcp/1347/p2p/12D3KooWScFR7385LTyR4zU1bYdzSiiAb5rnNABfVahPvVSzyTkR
+bootstrap=/dns4/lotus-bootstrap.ipfsforce.com/tcp/41778/p2p/12D3KooWGhufNmZHF3sv48aQeS13ng5XVJZ9E6qy2Ms4VzqeUsHk
+bootstrap=/dns4/bootstrap-0.starpool.in/tcp/12757/p2p/12D3KooWGHpBMeZbestVEWkfdnC9u7p6uFHXL1n7m1ZBqsEmiUzz
+bootstrap=/dns4/bootstrap-1.starpool.in/tcp/12757/p2p/12D3KooWQZrGH1PxSNZPum99M1zNvjNFM33d1AAu5DcvdHptuU7u
+bootstrap=/dns4/node.glif.io/tcp/1235/p2p/12D3KooWBF8cpp65hp2u9LK5mh19x67ftAam84z9LsfaquTDSBpt
+bootstrap=/dns4/bootstrap-0.ipfsmain.cn/tcp/34721/p2p/12D3KooWQnwEGNqcM2nAcPtRR9rAX8Hrg4k9kJLCHoTR5chJfz6d
+bootstrap=/dns4/bootstrap-1.ipfsmain.cn/tcp/34723/p2p/12D3KooWMKxMkD5DMpSWsW7dBddKxKT7L2GgbNuckz9otxvkvByP

docker/miner_entrypoint.sh

@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+
+set -e
+
+# if first arg looks like a flag, assume we want to run fuhon-miner
+if [ "${1:0:1}" = '-' ]; then
+  set -- fuhon-miner "$@"
+fi
+
+exec "$@"

docker/node_entrypoint.sh

@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+
+set -e
+
+# if first arg looks like a flag, assume we want to run fuhon-node
+if [ "${1:0:1}" = '-' ]; then
+  set -- fuhon-node "$@"
+fi
+
+exec "$@"