From c6ab9275b8c0257d419883cb3619656657d61f81 Mon Sep 17 00:00:00 2001 From: Doge Date: Wed, 12 Oct 2022 21:15:39 +0800 Subject: [PATCH 1/5] add: TON Overflow --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index 177bc3ee..e15f5bb6 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,4 @@ +[![TON Overflow Group][ton-overflow-badge]][ton-overflow-url] [![Stack Overflow Group][stack-overflow-badge]][stack-overflow-url] [![Telegram Foundation Group][telegram-foundation-badge]][telegram-foundation-url] [![Telegram Community Group][telegram-community-badge]][telegram-community-url] @@ -11,6 +12,8 @@ [twitter-url]: https://twitter.com/ton_blockchain [stack-overflow-badge]: https://img.shields.io/badge/-Stack%20Overflow-FE7A16?style=flat&logo=stack-overflow&logoColor=white [stack-overflow-url]: https://stackoverflow.com/questions/tagged/ton +[ton-overflow-badge]: https://img.shields.io/badge/-TON%20Overflow-FE7A16?style=flat&logo=stack-overflow&logoColor=white +[ton-overflow-url]: https://answers.ton.org From 178016a9f14a674712ff7e7a86e7d9e1c853f9c8 Mon Sep 17 00:00:00 2001 From: neodiX42 Date: Tue, 22 Nov 2022 08:53:44 +0100 Subject: [PATCH 2/5] Update docker README.md Update the link to the TON docker repo --- docker/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/README.md b/docker/README.md index 955fd3ef..2c44af52 100644 --- a/docker/README.md +++ b/docker/README.md @@ -2,7 +2,7 @@ Dockerfile for The Open Network Node #### Install -```docker pull ghcr.io/newton-blockchain/ton``` +```docker pull ghcr.io/ton-blockchain/ton:latest``` #### Create volume ```docker volume create ton-db``` #### Run From acd362a214b82330dc9193bb204846b422df00d4 Mon Sep 17 00:00:00 2001 From: neodiX42 Date: Tue, 22 Nov 2022 03:07:50 -0800 Subject: [PATCH 3/5] Add missing libatomic1 into TON docker image (#525) * Update Dockerfile Add libatomic1 to docker image * Update Dockerfile Add ninja-build * Update Dockerfile Remove redundant binaries * Update README.md Remove old repo --- docker/Dockerfile | 7 ++++--- docker/README.md | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 9d6b6b27..e5b1b221 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,17 +1,18 @@ FROM ubuntu:20.04 as builder RUN apt-get update && \ - DEBIAN_FRONTEND=noninteractive apt-get install -y build-essential cmake clang-6.0 openssl libssl-dev zlib1g-dev gperf wget git && \ + DEBIAN_FRONTEND=noninteractive apt-get install -y build-essential cmake clang-6.0 openssl libssl-dev zlib1g-dev gperf wget git libatomic1 ninja-build && \ rm -rf /var/lib/apt/lists/* ENV CC clang-6.0 ENV CXX clang++-6.0 +ENV CCACHE_DISABLE 1 WORKDIR / RUN git clone --recursive https://github.com/ton-blockchain/ton WORKDIR /ton RUN mkdir build && \ cd build && \ - cmake .. -DCMAKE_BUILD_TYPE=Release && \ - make -j 4 + cmake -GNinja -DCMAKE_BUILD_TYPE=Release .. && \ + ninja tonlibjson fift func validator-engine validator-engine-console generate-random-id dht-server lite-client FROM ubuntu:20.04 RUN apt-get update && \ diff --git a/docker/README.md b/docker/README.md index 2c44af52..fd98374b 100644 --- a/docker/README.md +++ b/docker/README.md @@ -6,7 +6,7 @@ Dockerfile for The Open Network Node #### Create volume ```docker volume create ton-db``` #### Run -```docker run -d --name ton-node --mount source=ton-db,target=/var/ton-work/db --network host -e "PUBLIC_IP=" -e "CONSOLE_PORT=" -e "LITESERVER=true" -e "LITE_PORT=" -it ghcr.io/newton-blockchain/ton``` +```docker run -d --name ton-node --mount source=ton-db,target=/var/ton-work/db --network host -e "PUBLIC_IP=" -e "CONSOLE_PORT=" -e "LITESERVER=true" -e "LITE_PORT=" -it ghcr.io/ton-blockchain/ton``` If you don't need Liteserver, then remove -e "LITESERVER=true". From 513e166cf42d29755f4d137221cf9ff80f3aa8ab Mon Sep 17 00:00:00 2001 From: neodiX42 Date: Tue, 22 Nov 2022 13:39:55 +0200 Subject: [PATCH 4/5] Update TON Dockefile Make libatomic1 available for binaries at runtime. --- docker/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index e5b1b221..95395bb9 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,6 +1,6 @@ FROM ubuntu:20.04 as builder RUN apt-get update && \ - DEBIAN_FRONTEND=noninteractive apt-get install -y build-essential cmake clang-6.0 openssl libssl-dev zlib1g-dev gperf wget git libatomic1 ninja-build && \ + DEBIAN_FRONTEND=noninteractive apt-get install -y build-essential cmake clang-6.0 openssl libssl-dev zlib1g-dev gperf wget git ninja-build && \ rm -rf /var/lib/apt/lists/* ENV CC clang-6.0 ENV CXX clang++-6.0 @@ -16,7 +16,7 @@ RUN mkdir build && \ FROM ubuntu:20.04 RUN apt-get update && \ - apt-get install -y openssl wget&& \ + apt-get install -y openssl wget libatomic1 && \ rm -rf /var/lib/apt/lists/* RUN mkdir -p /var/ton-work/db && \ mkdir -p /var/ton-work/db/static From ee43c3934051b8bc461810804648f0ca92075beb Mon Sep 17 00:00:00 2001 From: neodiX42 Date: Tue, 22 Nov 2022 15:23:18 +0200 Subject: [PATCH 5/5] Update docker-ubuntu-image.yml Update host OS to 20.04 --- .github/workflows/docker-ubuntu-image.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker-ubuntu-image.yml b/.github/workflows/docker-ubuntu-image.yml index ad83c099..c0828a24 100644 --- a/.github/workflows/docker-ubuntu-image.yml +++ b/.github/workflows/docker-ubuntu-image.yml @@ -1,4 +1,4 @@ -name: Docker Ubuntu 18.04 image +name: Docker Ubuntu 20.04 image on: workflow_dispatch: @@ -10,7 +10,7 @@ env: jobs: build-and-push: - runs-on: ubuntu-18.04 + runs-on: ubuntu-20.04 steps: - name: Checkout uses: actions/checkout@v2