diff --git a/.github/script/amd64-18.04.Dockerfile b/.github/script/amd64-18.04.Dockerfile index 741707bf..ba931517 100644 --- a/.github/script/amd64-18.04.Dockerfile +++ b/.github/script/amd64-18.04.Dockerfile @@ -6,7 +6,7 @@ RUN apt install -y build-essential cmake clang openssl libssl-dev zlib1g-dev gpe WORKDIR / -RUN git clone --recurse-submodules https://github.com/ton-blockchain/ton.git +RUN git clone --recurse-submodules https://github.com/ton-blockchain/ton.git && git checkout $branch WORKDIR /ton RUN mkdir /ton/build diff --git a/.github/script/amd64-20.04.Dockerfile b/.github/script/amd64-20.04.Dockerfile index 7bc7f6f8..f275f475 100644 --- a/.github/script/amd64-20.04.Dockerfile +++ b/.github/script/amd64-20.04.Dockerfile @@ -6,7 +6,7 @@ RUN apt install -y build-essential cmake clang openssl libssl-dev zlib1g-dev gpe WORKDIR / -RUN git clone --recurse-submodules https://github.com/ton-blockchain/ton.git +RUN git clone --recurse-submodules https://github.com/ton-blockchain/ton.git && git checkout $branch WORKDIR /ton RUN mkdir /ton/build diff --git a/.github/script/amd64-22.04.Dockerfile b/.github/script/amd64-22.04.Dockerfile index c1805d2f..23826bff 100644 --- a/.github/script/amd64-22.04.Dockerfile +++ b/.github/script/amd64-22.04.Dockerfile @@ -6,7 +6,7 @@ RUN apt install -y build-essential cmake clang openssl libssl-dev zlib1g-dev gpe WORKDIR / -RUN git clone --recurse-submodules https://github.com/ton-blockchain/ton.git +RUN git clone --recurse-submodules https://github.com/ton-blockchain/ton.git && git checkout $branch WORKDIR /ton RUN mkdir /ton/build diff --git a/.github/workflows/docker-compile-ubuntu.yml b/.github/workflows/docker-compile-ubuntu.yml index 04eeceed..ebacfd00 100644 --- a/.github/workflows/docker-compile-ubuntu.yml +++ b/.github/workflows/docker-compile-ubuntu.yml @@ -24,8 +24,9 @@ jobs: - name: Build with docker buildx run: | - mkdir build-${{matrix.ver}}-${{matrix.arch}} - docker buildx build --platform=linux/${{matrix.arch}} --progress=plain --load . -t build-${{matrix.ver}}-${{matrix.arch}} -f .github/script/${{matrix.arch}}-${{matrix.ver}}.Dockerfile + mkdir build-${{matrix.ver}}-${{matrix.arch}} + + docker buildx build --build-arg branch=${GITHUB_REF##*/} --platform=linux/${{matrix.arch}} --progress=plain --load . -t build-${{matrix.ver}}-${{matrix.arch}} -f .github/script/${{matrix.arch}}-${{matrix.ver}}.Dockerfile container_id=$(docker create --platform=linux/${{matrix.arch}} build-${{matrix.ver}}-${{matrix.arch}}) docker cp $container_id:/ton/build/dht-server/dht-server build-${{matrix.ver}}-${{matrix.arch}}/ docker cp -a $container_id:/ton/build/validator-engine/validator-engine build-${{matrix.ver}}-${{matrix.arch}}/ diff --git a/docker/Dockerfile b/docker/Dockerfile index 980751a1..71f09321 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -18,9 +18,12 @@ FROM ubuntu:20.04 RUN apt-get update && \ 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 +COPY --from=builder /ton/build/storage/storage-daemon/storage-daemon /usr/local/bin/ +COPY --from=builder /ton/build/storage/storage-daemon/storage-daemon-cli /usr/local/bin/ COPY --from=builder /ton/build/lite-client/lite-client /usr/local/bin/ COPY --from=builder /ton/build/validator-engine/validator-engine /usr/local/bin/ COPY --from=builder /ton/build/validator-engine-console/validator-engine-console /usr/local/bin/ @@ -30,4 +33,4 @@ WORKDIR /var/ton-work/db COPY init.sh control.template ./ RUN chmod +x init.sh -ENTRYPOINT ["/var/ton-work/db/init.sh"] +ENTRYPOINT ["/var/ton-work/db/init.sh"] \ No newline at end of file