Merge pull request #111 from OneLiteFeatherNET/feat/arm

Feat/arm

Author: Randoooom

.cargo/config.toml

@@ -0,0 +1,2 @@
+[target.aarch64-unknown-linux-gnu]
+linker = "aarch64-linux-gnu-gcc"

.dockerignore

@@ -1,6 +1,6 @@
 .git/
 .github/
-lib/
+lib/node_modules/
 target/
 common/target/
 codegen/target/

.github/workflows/nightly.yml

@@ -97,13 +97,14 @@ jobs:
       - name: Build and push Docker image
         uses: docker/build-push-action@v6
         with:
+          platforms: linux/amd64,linux/arm64
           context: .
           push: true
           tags: ghcr.io/onelitefeathernet/feedback-fusion:nightly
 
   dashboard:
     needs: [docker]
-    name: docker
+    name: dashboard
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Sources
@@ -119,6 +120,7 @@ jobs:
       - name: Build and push Docker image
         uses: docker/build-push-action@v6
         with:
+          platforms: linux/amd64,linux/arm64
           context: .
           file: ./dashboard/Dockerfile
           push: true

.github/workflows/release.yml

@@ -102,13 +102,14 @@ jobs:
       - name: Build and push Docker image
         uses: docker/build-push-action@v6
         with:
+          platforms: linux/amd64,linux/arm64
           context: .
           push: true
           tags: ghcr.io/onelitefeathernet/feedback-fusion:${{env.VERSION}},ghcr.io/onelitefeathernet/feedback-fusion:latest
 
   dashboard:
     needs: [docker]
-    name: docker
+    name: dashboard 
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Sources
@@ -124,6 +125,7 @@ jobs:
       - name: Build and push Docker image
         uses: docker/build-push-action@v6
         with:
+          platforms: linux/amd64,linux/arm64
           context: .
           file: ./dashboard/Dockerfile
           push: true

Cargo.toml

@@ -29,6 +29,7 @@ lazy_static = "1.4.0"
 log = "0.4.22"
 nanoid = "0.4.0"
 openidconnect = "3.5.0"
+openssl = { version = "0.10.68", features = ["vendored"] }
 opentelemetry = { version = "0.24.0", optional = true }
 opentelemetry_sdk = { version = "0.24.0", optional = true, features = [
   "rt-tokio",

Dockerfile

@@ -1,14 +1,15 @@
-FROM rust:slim AS build
+FROM --platform=linux/amd64 rust:slim AS build
 
 COPY ./rust-toolchain.toml ./rust-toolchain.toml
 
 RUN apt-get update \ 
-  && apt-get install libssl-dev protobuf-compiler libprotobuf-dev pkg-config -y --no-install-recommends \
-  && apt-get clean \
-  && rustup update
+  && apt-get install build-essential libssl-dev pkg-config libprotobuf-dev protobuf-compiler gcc-aarch64-linux-gnu libc6-dev-arm64-cross -y \
+  && rustup update \
+  && rustup target add aarch64-unknown-linux-gnu
 
 ARG features=all-databases,otlp
 
+COPY ./.cargo ./.cargo
 COPY ./Cargo.toml . 
 COPY ./Cargo.lock . 
 COPY ./proto ./proto
@@ -18,7 +19,14 @@ COPY ./src ./src
 COPY ./benches ./benches
 COPY ./fuzz ./fuzz
 
-RUN cargo build --release --features $features
+ARG TARGETARCH
+
+RUN if [ "$TARGETARCH" = "arm64" ]; then \
+        cargo build --release --target aarch64-unknown-linux-gnu --features $features; \
+        mv target/aarch64-unknown-linux-gnu/release/feedback-fusion target/release/feedback-fusion; \
+    else \
+        cargo build --release --features $features; \
+    fi
 
 FROM gcr.io/distroless/cc-debian12
 

Makefile

@@ -1,13 +1,11 @@
 .PHONY: fuzz
 
-pnpm:
-	pnpm i -C lib 
-	pnpm i -C docs
-
-core_generate: pnpm
+core_generate:
+	pnpm i -C lib
 	pnpm run -C lib protoc
 
 docs: core_generate
+	pnpm i -C docs
 	pnpm run -C lib dev
 
 lib_build: core_generate
@@ -18,12 +16,12 @@ helm_docs:
 	cp charts/feedback-fusion/README.md docs/docs/deployment/helm.md
 
 docs_build: lib_build
-	cd ./docs && pnpm run -C lib docs:build
+	pnpm run -C docs docs:build
 
-extract_translations: pnpm
+extract_translations:
 	pnpm run -C lib translations:extract
 
-build_translations: pnpm
+build_translations:
 	pnpm run -C lib translations:build
 
 # dashboard 

dashboard/Dockerfile

@@ -1,8 +1,10 @@
-FROM node:22-bookworm-slim AS build-ssr
+FROM --platform=linux/amd64 node:22-bookworm-slim AS build-ssr
 
-RUN apt-get update && apt-get install -y protobuf-compiler libprotobuf-dev make && npm i -g pnpm
+RUN apt-get update && apt-get install -y protobuf-compiler libprotobuf-dev make && npm i -g pnpm && mkdir build
 
-COPY ./dashboard/ ./dashboard
+WORKDIR build
+
+COPY ./dashboard ./dashboard
 COPY ./proto ./proto
 COPY ./lib ./lib
 COPY ./Makefile .
@@ -11,6 +13,6 @@ RUN make dashboard_build
 
 FROM gcr.io/distroless/nodejs22-debian12
 
-COPY --from=build-ssr /dashboard/.output/ ./.output
+COPY --from=build-ssr /build/dashboard/.output/ ./.output
 
 CMD [".output/server/index.mjs"]

renovate.json

@@ -1,19 +1,6 @@
 {
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
   "extends": [
-    "config:base"
-  ],
-  "packageRules": [
-    {
-      "matchPackagePatterns": [
-        "*"
-      ],
-      "matchUpdateTypes": [
-        "minor",
-        "patch"
-      ],
-      "groupName": "all non-major dependencies",
-      "groupSlug": "all-minor-patch"
-    }
+    "config:recommended"
   ]
 }