From ca13c0a2c108c0cf4464bf88d62657551a889b48 Mon Sep 17 00:00:00 2001 From: "Ben V. Brown" Date: Tue, 27 Dec 2022 10:47:35 +1100 Subject: [PATCH] Build bestool first in docker chain --- .gitignore | 1 + Dockerfile | 9 +++++++++ docker-compose.yml | 2 ++ log.txt | 8 -------- 4 files changed, 12 insertions(+), 8 deletions(-) delete mode 100644 log.txt diff --git a/.gitignore b/.gitignore index d372c7b..dabe86e 100644 --- a/.gitignore +++ b/.gitignore @@ -98,3 +98,4 @@ Release/ # configuration file # *.ini log.txt +log.txt diff --git a/Dockerfile b/Dockerfile index 2574c24..650d1e3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,15 @@ +FROM rust:1-alpine3.16 as programmer_build +LABEL maintainer="Ben V. Brown " +WORKDIR /usr/src +RUN apk add --no-cache git musl-dev +RUN git clone https://github.com/Ralim/bestool.git +RUN cd /usr/src/bestool/bestool/ && cargo build --release + FROM alpine:3.16 LABEL maintainer="Ben V. Brown " +COPY --from=programmer_build /usr/src/bestool/bestool/target/release/bestool /usr/local/bin/bestool + RUN apk add --no-cache gcc-arm-none-eabi newlib-arm-none-eabi make git bash WORKDIR /src # Git trust diff --git a/docker-compose.yml b/docker-compose.yml index 971d7b9..166ec3e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,8 +3,10 @@ services: builder: stdin_open: true tty: true + privileged: true build: context: . command: /bin/bash volumes: - ./:/src:Z + - /dev/:/dev/ diff --git a/log.txt b/log.txt deleted file mode 100644 index b71c697..0000000 --- a/log.txt +++ /dev/null @@ -1,8 +0,0 @@ -MAKE START: 2022-11-28 10:41:11.124503821 -make[1]: Entering directory '/home/caoyin/doc/jisheng_code/js_customer_code/shenzhen_meng_23000yp/best2300yp_open_source/out/open_source' -------------------------------- -REVISION_INFO: 29b195e-dirty:open_source -------------------------------- -make[1]: Leaving directory '/home/caoyin/doc/jisheng_code/js_customer_code/shenzhen_meng_23000yp/best2300yp_open_source/out/open_source' -MAKE END: 2022-11-28 10:41:11.262680315 -MAKE TIME: 0.14 seconds