Compare commits

...
6 Commits
5 changed files with 21 additions and 16 deletions

No files matched your search

+8 -8
View File
@@ -53,9 +53,9 @@ jobs:
uses: docker/build-push-action@v4 uses: docker/build-push-action@v4
with: with:
context: . context: .
push: false push: true
platforms: linux/amd64,linux/arm64 platforms: linux/amd64,linux/arm64
tags: base:latest tags: ghcr.io/${{ github.repository_owner }}/base:latest
# Authenticate with Docker Hub and GHCR # Authenticate with Docker Hub and GHCR
- name: Login to DockerHub - name: Login to DockerHub
@@ -89,7 +89,7 @@ jobs:
file: crates/delta/Dockerfile file: crates/delta/Dockerfile
tags: ${{ steps.meta-delta.outputs.tags }} tags: ${{ steps.meta-delta.outputs.tags }}
build-args: | build-args: |
BASE_IMAGE=base:latest BASE_IMAGE=ghcr.io/${{ github.repository_owner }}/base:latest
labels: ${{ steps.meta-delta.outputs.labels }} labels: ${{ steps.meta-delta.outputs.labels }}
# revoltchat/bonfire # revoltchat/bonfire
@@ -109,7 +109,7 @@ jobs:
file: crates/bonfire/Dockerfile file: crates/bonfire/Dockerfile
tags: ${{ steps.meta-bonfire.outputs.tags }} tags: ${{ steps.meta-bonfire.outputs.tags }}
build-args: | build-args: |
BASE_IMAGE=base:latest BASE_IMAGE=ghcr.io/${{ github.repository_owner }}/base:latest
labels: ${{ steps.meta-bonfire.outputs.labels }} labels: ${{ steps.meta-bonfire.outputs.labels }}
# revoltchat/autumn # revoltchat/autumn
@@ -129,7 +129,7 @@ jobs:
file: crates/services/autumn/Dockerfile file: crates/services/autumn/Dockerfile
tags: ${{ steps.meta-autumn.outputs.tags }} tags: ${{ steps.meta-autumn.outputs.tags }}
build-args: | build-args: |
BASE_IMAGE=base:latest BASE_IMAGE=ghcr.io/${{ github.repository_owner }}/base:latest
labels: ${{ steps.meta-autumn.outputs.labels }} labels: ${{ steps.meta-autumn.outputs.labels }}
# revoltchat/january # revoltchat/january
@@ -149,7 +149,7 @@ jobs:
file: crates/services/january/Dockerfile file: crates/services/january/Dockerfile
tags: ${{ steps.meta-january.outputs.tags }} tags: ${{ steps.meta-january.outputs.tags }}
build-args: | build-args: |
BASE_IMAGE=base:latest BASE_IMAGE=ghcr.io/${{ github.repository_owner }}/base:latest
labels: ${{ steps.meta-january.outputs.labels }} labels: ${{ steps.meta-january.outputs.labels }}
# revoltchat/crond # revoltchat/crond
@@ -169,7 +169,7 @@ jobs:
file: crates/daemons/crond/Dockerfile file: crates/daemons/crond/Dockerfile
tags: ${{ steps.meta-crond.outputs.tags }} tags: ${{ steps.meta-crond.outputs.tags }}
build-args: | build-args: |
BASE_IMAGE=base:latest BASE_IMAGE=ghcr.io/${{ github.repository_owner }}/base:latest
labels: ${{ steps.meta-crond.outputs.labels }} labels: ${{ steps.meta-crond.outputs.labels }}
# revoltchat/pushd # revoltchat/pushd
@@ -189,5 +189,5 @@ jobs:
file: crates/daemons/pushd/Dockerfile file: crates/daemons/pushd/Dockerfile
tags: ${{ steps.meta-pushd.outputs.tags }} tags: ${{ steps.meta-pushd.outputs.tags }}
build-args: | build-args: |
BASE_IMAGE=base:latest BASE_IMAGE=ghcr.io/${{ github.repository_owner }}/base:latest
labels: ${{ steps.meta-pushd.outputs.labels }} labels: ${{ steps.meta-pushd.outputs.labels }}
+2 -1
View File
@@ -1,5 +1,5 @@
# Build Stage # Build Stage
FROM --platform="${BUILDPLATFORM}" rust:1.77.2-slim-bookworm FROM --platform="${BUILDPLATFORM}" rust:1.86.0-slim-bookworm
USER 0:0 USER 0:0
WORKDIR /home/rust/src WORKDIR /home/rust/src
@@ -24,6 +24,7 @@ COPY crates/core/config/Cargo.toml ./crates/core/config/
COPY crates/core/database/Cargo.toml ./crates/core/database/ COPY crates/core/database/Cargo.toml ./crates/core/database/
COPY crates/core/files/Cargo.toml ./crates/core/files/ COPY crates/core/files/Cargo.toml ./crates/core/files/
COPY crates/core/models/Cargo.toml ./crates/core/models/ COPY crates/core/models/Cargo.toml ./crates/core/models/
COPY crates/core/parser/Cargo.toml ./crates/core/parser/
COPY crates/core/permissions/Cargo.toml ./crates/core/permissions/ COPY crates/core/permissions/Cargo.toml ./crates/core/permissions/
COPY crates/core/presence/Cargo.toml ./crates/core/presence/ COPY crates/core/presence/Cargo.toml ./crates/core/presence/
COPY crates/core/result/Cargo.toml ./crates/core/result/ COPY crates/core/result/Cargo.toml ./crates/core/result/
+2 -1
View File
@@ -1,5 +1,5 @@
# Build Stage # Build Stage
FROM rust:1.77.2-slim-bookworm FROM rust:1.86.0-slim-bookworm
USER 0:0 USER 0:0
WORKDIR /home/rust/src WORKDIR /home/rust/src
@@ -20,6 +20,7 @@ COPY crates/core/config/Cargo.toml ./crates/core/config/
COPY crates/core/database/Cargo.toml ./crates/core/database/ COPY crates/core/database/Cargo.toml ./crates/core/database/
COPY crates/core/files/Cargo.toml ./crates/core/files/ COPY crates/core/files/Cargo.toml ./crates/core/files/
COPY crates/core/models/Cargo.toml ./crates/core/models/ COPY crates/core/models/Cargo.toml ./crates/core/models/
COPY crates/core/parser/Cargo.toml ./crates/core/parser/
COPY crates/core/permissions/Cargo.toml ./crates/core/permissions/ COPY crates/core/permissions/Cargo.toml ./crates/core/permissions/
COPY crates/core/presence/Cargo.toml ./crates/core/presence/ COPY crates/core/presence/Cargo.toml ./crates/core/presence/
COPY crates/core/result/Cargo.toml ./crates/core/result/ COPY crates/core/result/Cargo.toml ./crates/core/result/
+2 -2
View File
@@ -34,10 +34,10 @@ The services and libraries that power the Revolt service.<br/>
## Minimum Supported Rust Version ## Minimum Supported Rust Version
Rust 1.76 or higher. Rust 1.86.0 or higher.
> [!CAUTION] > [!CAUTION]
> The events server has a significant performance regression between Rust 1.77.2 and 1.78.0 onwards, see [issue #341](https://github.com/revoltchat/backend/issues/341). > The events server has a significant performance regression between Rust 1.77.2 and 1.78.0 onwards, see [issue #341](https://github.com/revoltchat/backend/issues/341). This is currently solved by build time options but we are looking for a proper fix.
## Development Guide ## Development Guide
+7 -4
View File
@@ -29,6 +29,7 @@ deps() {
crates/core/database/src \ crates/core/database/src \
crates/core/files/src \ crates/core/files/src \
crates/core/models/src \ crates/core/models/src \
crates/core/parser/src \
crates/core/permissions/src \ crates/core/permissions/src \
crates/core/presence/src \ crates/core/presence/src \
crates/core/result/src \ crates/core/result/src \
@@ -49,14 +50,15 @@ deps() {
tee crates/core/database/src/lib.rs | tee crates/core/database/src/lib.rs |
tee crates/core/files/src/lib.rs | tee crates/core/files/src/lib.rs |
tee crates/core/models/src/lib.rs | tee crates/core/models/src/lib.rs |
tee crates/core/parser/src/lib.rs |
tee crates/core/permissions/src/lib.rs | tee crates/core/permissions/src/lib.rs |
tee crates/core/presence/src/lib.rs | tee crates/core/presence/src/lib.rs |
tee crates/core/result/src/lib.rs tee crates/core/result/src/lib.rs
if [ -z "$TARGETARCH" ]; then if [ -z "$TARGETARCH" ]; then
cargo build -j 24 --locked --release cargo build -j 10 --locked --release
else else
cargo build -j 24 --locked --release --target "${BUILD_TARGET}" cargo build -j 10 --locked --release --target "${BUILD_TARGET}"
fi fi
} }
@@ -69,14 +71,15 @@ apps() {
crates/core/config/src/lib.rs \ crates/core/config/src/lib.rs \
crates/core/database/src/lib.rs \ crates/core/database/src/lib.rs \
crates/core/models/src/lib.rs \ crates/core/models/src/lib.rs \
crates/core/parser/src/lib.rs \
crates/core/permissions/src/lib.rs \ crates/core/permissions/src/lib.rs \
crates/core/presence/src/lib.rs \ crates/core/presence/src/lib.rs \
crates/core/result/src/lib.rs crates/core/result/src/lib.rs
if [ -z "$TARGETARCH" ]; then if [ -z "$TARGETARCH" ]; then
cargo build -j 24 --locked --release cargo build -j 10 --locked --release
else else
cargo build -j 24 --locked --release --target "${BUILD_TARGET}" cargo build -j 10 --locked --release --target "${BUILD_TARGET}"
mv target _target && mv _target/"${BUILD_TARGET}" target mv target _target && mv _target/"${BUILD_TARGET}" target
fi fi
} }