more cleanup
All checks were successful
Build container images / build (push) Successful in 6m40s

This commit is contained in:
James Brumond 2023-11-02 23:49:30 -07:00
parent f9cc553f9c
commit c506c84987
Signed by: james
GPG Key ID: E8F2FC44BAA3357A
2 changed files with 11 additions and 11 deletions

View File

@ -35,8 +35,7 @@ jobs:
context: .
push: true
tags: |
gitea.jbrumond.me/images/rotate-backups:8
gitea.jbrumond.me/images/rotate-backups:8.1
gitea.jbrumond.me/images/rust-ci:latest
platforms: |
linux/amd64
linux/arm64

View File

@ -3,6 +3,10 @@ ARG NODE_VERSION=20
FROM node:${NODE_VERSION}
ENV CARGO_HOME=/usr/local/cargo
ENV RUSTUP_HOME=/usr/local/rustup
ENV PATH=/usr/local/cargo/bin:$PATH
RUN apt update && apt upgrade -y
RUN apt install -y g++-mingw-w64-x86-64 \
g++-arm-linux-gnueabihf libc6-dev-armhf-cross \
@ -10,9 +14,6 @@ RUN apt install -y g++-mingw-w64-x86-64 \
RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
ENV CARGO_BIN=$HOME/.cargo/bin
ENV PATH=$CARGO_BIN:$PATH
ENV CARGO_TARGET_ARMV7_UNKNOWN_LINUX_GNUEABIHF_LINKER=arm-linux-gnueabihf-gcc \
CC_armv7_unknown_Linux_gnueabihf=arm-linux-gnueabihf-gcc \
CXX_armv7_unknown_linux_gnueabihf=arm-linux-gnueabihf-g++
@ -21,10 +22,10 @@ ENV CARGO_TARGET_AARCH64_UNKNOWN_LINUX_GNU_LINKER=aarch64-linux-gnu-gcc \
CC_aarch64_unknown_linux_gnu=aarch64-linux-gnu-gcc \
CXX_aarch64_unknown_linux_gnu=aarch64-linux-gnu-g++
RUN $CARGO_BIN/rustup toolchain install stable-x86_64-unknown-linux-gnu
RUN rustup toolchain install stable-x86_64-unknown-linux-gnu
RUN $CARGO_BIN/rustup target add x86_64-pc-windows-gnu
RUN $CARGO_BIN/rustup target add x86_64-unknown-linux-gnu
RUN $CARGO_BIN/rustup target add armv7-unknown-linux-gnueabihf
RUN $CARGO_BIN/rustup target add aarch64-unknown-linux-gnu
RUN $CARGO_BIN/rustup target add wasm32-unknown-unknown
RUN rustup target add x86_64-pc-windows-gnu
RUN rustup target add x86_64-unknown-linux-gnu
RUN rustup target add armv7-unknown-linux-gnueabihf
RUN rustup target add aarch64-unknown-linux-gnu
RUN rustup target add wasm32-unknown-unknown