From aaebaf27f3680b3910352ac78e60ee7390093536 Mon Sep 17 00:00:00 2001 From: AtomXY Date: Fri, 6 Sep 2024 14:04:45 +0300 Subject: [PATCH 1/2] Up Q-server --- q-server.version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/q-server.version b/q-server.version index 70cd226..4a46fb5 100644 --- a/q-server.version +++ b/q-server.version @@ -1 +1 @@ -0.63.0 +0.68.0 From 9eebfcc6d2a54a4db2b426e46cf5f4b33a01a91a Mon Sep 17 00:00:00 2001 From: AtomXY Date: Mon, 9 Sep 2024 13:25:51 +0300 Subject: [PATCH 2/2] Fix custom --- docker/custom/Dockerfile | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/docker/custom/Dockerfile b/docker/custom/Dockerfile index 4338e3a..a05a573 100644 --- a/docker/custom/Dockerfile +++ b/docker/custom/Dockerfile @@ -1,31 +1,27 @@ ### STAGE build-kit -FROM ubuntu:24.04 as build-kit +FROM ubuntu:24.04 AS build-kit ENV RUST_VERSION=1.80.1 ENV CARGO_HOME=/rust -RUN apk update && \ +RUN apt update && \ mkdir $CARGO_HOME && \ - apk add \ + apt install -y \ bash \ bash-completion \ ca-certificates \ clang \ - clang-dev \ - clang-libs \ + libclang-dev \ cmake \ curl \ g++ \ gcc \ git \ make \ - musl \ - musl-dev \ - musl-utils \ + pkg-config \ openssh-client \ - openssh-keygen \ openssl \ - openssl-dev \ - zlib-dev && \ + libssl-dev \ + zlib1g-dev && \ curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain $RUST_VERSION -y && \ ssh-keygen -q -P "" -f ~/.ssh/id_rsa && \ ssh-keyscan github.com >> ~/.ssh/known_hosts; @@ -44,11 +40,12 @@ COPY ./integration-tests ./integration-tests RUN cargo build --release ### STAGE final-image -FROM alpine:3.20.2 as final-image +# FROM alpine:3.20.2 AS final-image +FROM ubuntu:24.04 AS final-image WORKDIR /ton-node -RUN apk update; \ - apk add libgcc libstdc++; +RUN apt update; \ + apt install -y libgcc-14-dev libstdc++-14-dev; # ton-node COPY --from=build-kit /ton-node/target/release/evernode_se /