Do better about caching

This commit is contained in:
asonix 2020-06-08 12:43:28 -05:00
parent fa93e2ecfa
commit 557ee64cf3
3 changed files with 30 additions and 24 deletions

View file

@ -1,15 +1,11 @@
FROM rustembedded/cross:x86_64-unknown-linux-musl AS builder FROM rustembedded/cross:x86_64-unknown-linux-musl AS x86_64-builder
ARG UID=991 ARG UID=991
ARG GID=991 ARG GID=991
ARG TOOLCHAIN=stable ENV TOOLCHAIN=stable
ARG TARGET=x86_64-unknown-linux-musl ENV TARGET=x86_64-unknown-linux-musl
ARG TOOL=x86_64-linux-musl ENV TOOL=x86_64-linux-musl
ARG REPOSITORY=https://git.asonix.dog/asonix/pict-rs
ARG TAG=master
ARG BINARY=pict-rs
RUN \ RUN \
apt-get update && \ apt-get update && \
@ -40,6 +36,12 @@ RUN \
./rustup.sh --default-toolchain $TOOLCHAIN --profile minimal -y && \ ./rustup.sh --default-toolchain $TOOLCHAIN --profile minimal -y && \
rustup target add $TARGET rustup target add $TARGET
FROM x86_64-builder as builder
ARG TAG=master
ARG REPOSITORY=https://git.asonix.dog/asonix/pict-rs
ARG BINARY=pict-rs
RUN \ RUN \
git clone -b $TAG $REPOSITORY repo git clone -b $TAG $REPOSITORY repo

View file

@ -1,15 +1,11 @@
FROM rustembedded/cross:arm-unknown-linux-musleabihf AS builder FROM rustembedded/cross:arm-unknown-linux-musleabihf AS arm32v7-builder
ARG UID=991 ARG UID=991
ARG GID=991 ARG GID=991
ARG TOOLCHAIN=stable ENV TOOLCHAIN=stable
ARG TARGET=arm-unknown-linux-musleabihf ENV TARGET=arm-unknown-linux-musleabihf
ARG TOOL=arm-linux-musleabihf ENV TOOL=arm-linux-musleabihf
ARG REPOSITORY=https://git.asonix.dog/asonix/pict-rs
ARG TAG=master
ARG BINARY=pict-rs
RUN \ RUN \
apt-get update && \ apt-get update && \
@ -40,6 +36,12 @@ RUN \
./rustup.sh --default-toolchain $TOOLCHAIN --profile minimal -y && \ ./rustup.sh --default-toolchain $TOOLCHAIN --profile minimal -y && \
rustup target add $TARGET rustup target add $TARGET
FROM arm32v7-builder as builder
ARG TAG=master
ARG REPOSITORY=https://git.asonix.dog/asonix/pict-rs
ARG BINARY=pict-rs
RUN \ RUN \
git clone -b $TAG $REPOSITORY repo git clone -b $TAG $REPOSITORY repo

View file

@ -1,15 +1,11 @@
FROM rustembedded/cross:aarch64-unknown-linux-musl AS builder FROM rustembedded/cross:aarch64-unknown-linux-musl AS aarch64-builder
ARG UID=991 ARG UID=991
ARG GID=991 ARG GID=991
ARG TOOLCHAIN=stable ENV TOOLCHAIN=stable
ARG TARGET=aarch64-unknown-linux-musl ENV TARGET=aarch64-unknown-linux-musl
ARG TOOL=aarch64-linux-musl ENV TOOL=aarch64-linux-musl
ARG REPOSITORY=https://git.asonix.dog/asonix/pict-rs
ARG TAG=master
ARG BINARY=pict-rs
RUN \ RUN \
apt-get update && \ apt-get update && \
@ -40,6 +36,12 @@ RUN \
./rustup.sh --default-toolchain $TOOLCHAIN --profile minimal -y && \ ./rustup.sh --default-toolchain $TOOLCHAIN --profile minimal -y && \
rustup target add $TARGET rustup target add $TARGET
FROM aarch64-builder as builder
ARG TAG=master
ARG REPOSITORY=https://git.asonix.dog/asonix/pict-rs
ARG BINARY=pict-rs
RUN \ RUN \
git clone -b $TAG $REPOSITORY repo git clone -b $TAG $REPOSITORY repo