Refactor Dockerfile - see description

- Use Debian Bullseye as `base` image.
- Use proper `LABEL` for authors/maintainers.
- Multi-stage builds.
- Download Rust via rustup.
- Combine RUN commands to reduce layers.
This commit is contained in:
Dom Rodriguez 2023-01-05 19:13:19 +00:00
parent d3a6ef0784
commit 71fedffbad
No known key found for this signature in database
GPG Key ID: 72DCF1231E54BD43
1 changed files with 39 additions and 15 deletions

View File

@ -1,23 +1,47 @@
FROM rust:1-slim-buster as programmer_build FROM debian:bullseye-slim AS base
LABEL maintainer="Ben V. Brown <ralim@ralimtek.com>"
FROM base AS rust_build
LABEL org.opencontainers.image.authors = "Ben V. Brown <ralim@ralimtek.com>, Dom Rodriguez <shymega@shymega.org.uk>"
WORKDIR /usr/src WORKDIR /usr/src
RUN apt-get update && apt-get install -y git pkg-config libudev-dev bc ENV PATH="/root/.cargo/bin:$PATH"
RUN git clone https://github.com/Ralim/bestool.git
RUN cd /usr/src/bestool/bestool/ && cargo build --release
FROM debian:buster RUN apt-get update \
LABEL maintainer="Ben V. Brown <ralim@ralimtek.com>" && apt-get install -y \
bc \
build-essential \
curl \
git \
libudev-dev \
pkg-config \
&& curl https://sh.rustup.rs -sSf | bash -s -- -y \
&& git clone https://github.com/Ralim/bestool.git \
&& cd /usr/src/bestool/bestool/ \
&& cargo build --release
FROM base as dev_env
RUN apt update && apt-get install -y make git bash curl tar bzip2 bc xxd ffmpeg WORKDIR /usr/src
WORKDIR /src RUN apt-get update \
# Git trust && apt-get install -y \
RUN git config --global --add safe.directory /src bash \
# Grab arm compiler; we have to use this ancient one or else we get boot failures. Probably subtle link issues. bc \
bzip2 \
curl \
ffmpeg \
git \
make \
tar \
xxd \
&& git config --global --add safe.directory /src \
&& mkdir -pv /src \
&& 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 -C /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" ENV PATH="${PATH}:/src/gcc-arm-none-eabi-9-2019-q4-major/bin"
WORKDIR /usr/src COPY --from=rust_build /usr/src/bestool/bestool/target/release/bestool /usr/local/bin/bestool
COPY --from=programmer_build /usr/src/bestool/bestool/target/release/bestool /usr/local/bin/bestool
COPY . /usr/src COPY . /usr/src
ENTRYPOINT ["/bin/bash"]