Merge pull request #2 from Ralim/add-programmer

Fix dockerfile + Add programmer
This commit is contained in:
Ben V. Brown 2022-12-27 22:47:45 +11:00 committed by GitHub
commit da37d7ec84
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
28 changed files with 21 additions and 12 deletions

1
.gitignore vendored
View File

@ -98,3 +98,4 @@ Release/
# configuration file # configuration file
# *.ini # *.ini
log.txt log.txt
log.txt

View File

@ -1,9 +1,23 @@
FROM alpine:3.16 FROM rust:1-slim-buster as programmer_build
LABEL maintainer="Ben V. Brown <ralim@ralimtek.com>"
WORKDIR /usr/src
RUN apt-get update && apt-get install -y git pkg-config libudev-dev bc
RUN git clone https://github.com/Ralim/bestool.git
RUN cd /usr/src/bestool/bestool/ && cargo build --release
FROM debian:buster
LABEL maintainer="Ben V. Brown <ralim@ralimtek.com>" LABEL maintainer="Ben V. Brown <ralim@ralimtek.com>"
RUN apk add --no-cache gcc-arm-none-eabi newlib-arm-none-eabi make git bash
RUN apt update && apt-get install -y make git bash curl tar bzip2 bc
WORKDIR /src WORKDIR /src
# Git trust # Git trust
RUN git config --global --add safe.directory /src RUN git config --global --add safe.directory /src
# Grab arm compiler; we have to use this ancient one or else we get boot failures. Probably subtle link issues.
COPY . /src RUN curl https://armkeil.blob.core.windows.net/developer/Files/downloads/gnu-rm/9-2019q4/gcc-arm-none-eabi-9-2019-q4-major-x86_64-linux.tar.bz2 | tar -xj
ENV PATH="${PATH}:/src/gcc-arm-none-eabi-9-2019-q4-major/bin"
WORKDIR /usr/src
COPY --from=programmer_build /usr/src/bestool/bestool/target/release/bestool /usr/local/bin/bestool
COPY . /usr/src

View File

@ -3,8 +3,10 @@ services:
builder: builder:
stdin_open: true stdin_open: true
tty: true tty: true
privileged: true
build: build:
context: . context: .
command: /bin/bash command: /bin/bash
volumes: volumes:
- ./:/src:Z - ./:/usr/src:Z
- /dev/:/dev/

View File

@ -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

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.