Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/server.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ on:
env:
REGISTRY: ghcr.io
IMAGE_NAME: ${{ github.repository }}
RUST_VERSION: 1.85
RUST_VERSION: "1.90"
NODE_VERSION: 22

jobs:
Expand Down
5 changes: 2 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
ARG NODE_VERSION=22
ARG RUST_VERSION=1.85
ARG RUST_VERSION=1.90
ARG DEBIAN_VERSION=bookworm

### Build Rust backend ###
FROM rust:${RUST_VERSION}-slim-${DEBIAN_VERSION} AS backend-build
WORKDIR /app

COPY ./server/src src
COPY ./server/migrations migrations
COPY ./server/src src
COPY ./server/Cargo.toml ./server/Cargo.lock ./

ARG pkg=chat-rs-api
Expand Down Expand Up @@ -67,5 +67,4 @@ ENV RS_CHAT_STATIC_PATH=/var/www
ENV RS_CHAT_DATA_DIR=/data
ENV RS_CHAT_ADDRESS=0.0.0.0
ENV RS_CHAT_PORT=8080
EXPOSE 8080
CMD ["run-server"]
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ Your API keys are encrypted and stored in the database.

### Prerequisites

- **Rust** >= 1.85 ([Install Rust](https://rustup.rs/))
- **Rust** >= 1.90 ([Install Rust](https://rustup.rs/))
- **Node.js** >= 20 with **pnpm** ([Install pnpm](https://pnpm.io/installation))
- **Docker** and **Docker Compose** (for databases)
### Setup
Expand Down
17 changes: 17 additions & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,21 @@ services:
volumes:
- redis_data:/data

stream:
image: ghcr.io/fa-sharp/tinistream:0.1.8
platform: linux/amd64
container_name: tinistream
ports:
- "8081:8081"
environment:
STREAMER_PORT: 8081
STREAMER_SERVER_ADDRESS: http://localhost:8081
STREAMER_REDIS_URL: redis://redis:6379
STREAMER_TTL: 360
env_file: server/.env
depends_on:
- redis

rschat:
build:
context: .
Expand All @@ -30,13 +45,15 @@ services:
RS_CHAT_DATABASE_URL: postgres://postgres:postgres@postgres/postgres
RS_CHAT_REDIS_URL: redis://redis:6379
RS_CHAT_DATA_DIR: /data
RS_CHAT_TINISTREAM_URL: http://tinistream:8081
env_file: server/.env
volumes:
- ./.docker:/certs
- rschat_data:/data
depends_on:
- db
- redis
- stream

volumes:
postgres_data:
Expand Down
4 changes: 3 additions & 1 deletion fly.toml
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
#:tombi schema.strict = false

app = "rs-chat"
primary_region = "ewr"

Expand All @@ -18,7 +20,7 @@ min_machines_running = 0
processes = ["app"]

[[vm]]
memory = "1gb"
memory = "512mb"
cpu_kind = "shared"
cpus = 2

Expand Down
Loading