cleanup

.gitea/workflows/build-and-pubish.yaml

@@ -2,7 +2,10 @@
 name: Build and publish container images
 
 on:
-- workflow_dispatch
+  workflow_dispatch: { }
+  # push:
+  #   branches:
+  #   - master
 
 jobs:
   build-and-publish:
@@ -35,8 +38,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

.gitea/workflows/build.yaml

@@ -2,6 +2,7 @@
 name: Build container images
 
 on:
+  workflow_dispatch: { }
   push:
     branches:
     - master

Dockerfile

@@ -3,13 +3,17 @@ 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
+ENV PKG_CONFIG_SYSROOT_DIR=/
+
 RUN apt update && apt upgrade -y
 RUN apt install -y g++-mingw-w64-x86-64 \
 	g++-arm-linux-gnueabihf libc6-dev-armhf-cross \
 	g++-aarch64-linux-gnu libc6-dev-arm64-cross
 
 RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
-RUN source "$HOME/.cargo/env"
 
 ENV CARGO_TARGET_ARMV7_UNKNOWN_LINUX_GNUEABIHF_LINKER=arm-linux-gnueabihf-gcc \
 	CC_armv7_unknown_Linux_gnueabihf=arm-linux-gnueabihf-gcc \
@@ -18,12 +22,3 @@ ENV CARGO_TARGET_ARMV7_UNKNOWN_LINUX_GNUEABIHF_LINKER=arm-linux-gnueabihf-gcc \
 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 rustup target add x86_64-pc-windows-gnu
-RUN rustup target add armv7-unknown-linux-gnueabihf
-RUN rustup target add aarch64-unknown-linux-gnu
-RUN rustup target add wasm32-unknown-unknown
-
-RUN rustup toolchain install stable-x86_64-pc-windows-gnu
-RUN rustup toolchain install stable-armv7-unknown-linux-gnueabihf
-RUN rustup toolchain install stable-aarch64-unknown-linux-gnu

readme.md

@@ -0,0 +1,39 @@
+
+Container image with Node20 and Rust, primarily for CI Rust build steps
+
+---
+
+```yaml
+name: Build
+
+on:
+  push:
+    branches:
+    - master
+  pull_request:
+    branches:
+    - master
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    container:
+      image: gitea.jbrumond.me/images/rust-ci:latest
+      credentials:
+        username: ${{ secrets.REGISTRY_USER }}
+        password: ${{ secrets.REGISTRY_TOKEN }}
+    strategy:
+      matrix:
+        rust-target:
+        - x86_64-pc-windows-gnu
+        - armv7-unknown-linux-gnueabihf
+        - aarch64-unknown-linux-gnu
+    steps:
+      - name: Check out the repo
+        uses: actions/checkout@v3
+
+      - name: Build
+        run: |
+          rustup target add ${{ matrix.rust-target }}
+          cargo build --target ${{ matrix.rust-target }}
+```