A free and open source instant messaging and VoIP chat app built for friends, groups, and communities.
feat(stack): run each rust service as one combined container
Hampus1c68073d4da7
diff --git a/fluxer_rexctl/cmd/lifecycle.go b/fluxer_rexctl/cmd/lifecycle.goindex c2a1c4065..20eda4d36 100644--- a/fluxer_rexctl/cmd/lifecycle.go+++ b/fluxer_rexctl/cmd/lifecycle.go@@ -50,10 +50,7 @@ var logParts = []logPart{{"storage", []string{"seaweedfs", "seaweedfs-init"}},{"cache", []string{"valkey"}},{"queue", []string{"nats"}},- {"internal", []string{- "snowflakes", "snowflakes-shard", "users", "users-shard", "gifs", "gifs-shard",- "messages", "messages-shard", "unfurl", "unfurl-shard",- }},+ {"internal", []string{"snowflakes", "users", "gifs", "messages", "unfurl"}},}func logServiceNames() []string {diff --git a/fluxer_rexctl/internal/stack/files/docker-compose.yml b/fluxer_rexctl/internal/stack/files/docker-compose.ymlindex c8d54edee..469ee1f49 100644--- a/fluxer_rexctl/internal/stack/files/docker-compose.yml+++ b/fluxer_rexctl/internal/stack/files/docker-compose.yml@@ -20,10 +20,10 @@ x-fluxer-env: &fluxer-envRUST_LOG: ${RUST_LOG:-}HTTP_PROXY: ${HTTP_PROXY:-}HTTPS_PROXY: ${HTTPS_PROXY:-}- NO_PROXY: localhost,127.0.0.1,::1,edge,postgres,valkey,nats,meilisearch,seaweedfs,livekit,api,worker,gateway,media-proxy,push,static-proxy,app-proxy,snowflakes,snowflakes-shard,users,users-shard,gifs,gifs-shard,messages,messages-shard,unfurl,unfurl-shard,admin${NO_PROXY:+,${NO_PROXY:-}}+ NO_PROXY: localhost,127.0.0.1,::1,edge,postgres,valkey,nats,meilisearch,seaweedfs,livekit,api,worker,gateway,media-proxy,push,static-proxy,app-proxy,snowflakes,users,gifs,messages,unfurl,admin${NO_PROXY:+,${NO_PROXY:-}}http_proxy: ${HTTP_PROXY:-}https_proxy: ${HTTPS_PROXY:-}- no_proxy: localhost,127.0.0.1,::1,edge,postgres,valkey,nats,meilisearch,seaweedfs,livekit,api,worker,gateway,media-proxy,push,static-proxy,app-proxy,snowflakes,snowflakes-shard,users,users-shard,gifs,gifs-shard,messages,messages-shard,unfurl,unfurl-shard,admin${NO_PROXY:+,${NO_PROXY:-}}+ no_proxy: localhost,127.0.0.1,::1,edge,postgres,valkey,nats,meilisearch,seaweedfs,livekit,api,worker,gateway,media-proxy,push,static-proxy,app-proxy,snowflakes,users,gifs,messages,unfurl,admin${NO_PROXY:+,${NO_PROXY:-}}FLUXER_SELF_HOSTED: "true"FLUXER_BASE_DOMAIN: ${FLUXER_DOMAIN:?rexctl manages this instance. Use rexctl, docker compose -p fluxer ps or logs, or run rexctl eject to use docker compose here}FLUXER_PUBLIC_SCHEME: ${FLUXER_PUBLIC_SCHEME:-https}@@ -569,9 +569,9 @@ services:valkey: {condition: service_healthy}nats: {condition: service_healthy}seaweedfs-init: {condition: service_completed_successfully}- snowflakes-shard: {condition: service_healthy}- messages-shard: {condition: service_healthy}- users-shard: {condition: service_healthy}+ snowflakes: {condition: service_healthy}+ messages: {condition: service_healthy}+ users: {condition: service_healthy}gateway:<<: *fluxer-service@@ -771,27 +771,11 @@ services:deploy:resources:limits:- memory: ${FLUXER_SNOWFLAKES_MEMORY_LIMIT:-128mb}- environment:- <<: *fluxer-rust-env- FLUXER_SVC_NAME: snowflakes- FLUXER_SVC_MODE: router- healthcheck: *fluxer-svc-healthcheck- depends_on:- nats: {condition: service_healthy}-- snowflakes-shard:- <<: *fluxer-service- image: ${FLUXER_REGISTRY:-ghcr.io/${FLUXER_REGISTRY_OWNER:-fluxerapp}}/fluxer-snowflakes:${FLUXER_IMAGE_TAG:-v1}- deploy:- resources:- limits:- memory: ${FLUXER_SNOWFLAKES_SHARD_MEMORY_LIMIT:-256mb}+ memory: ${FLUXER_SNOWFLAKES_MEMORY_LIMIT:-256mb}environment:<<: *fluxer-rust-envFLUXER_SVC_NAME: snowflakes- FLUXER_SVC_MODE: shard- FLUXER_SVC_SHARD_ID: "0"+ FLUXER_SVC_MODE: combinedhealthcheck: *fluxer-svc-healthcheckdepends_on:nats: {condition: service_healthy}@@ -802,28 +786,12 @@ services:deploy:resources:limits:- memory: ${FLUXER_USERS_MEMORY_LIMIT:-128mb}- environment:- <<: *fluxer-rust-env- FLUXER_SVC_NAME: users- FLUXER_SVC_MODE: router- healthcheck: *fluxer-svc-healthcheck- depends_on:- nats: {condition: service_healthy}-- users-shard:- <<: *fluxer-service- image: ${FLUXER_REGISTRY:-ghcr.io/${FLUXER_REGISTRY_OWNER:-fluxerapp}}/fluxer-users:${FLUXER_IMAGE_TAG:-v1}- deploy:- resources:- limits:- memory: ${FLUXER_USERS_SHARD_MEMORY_LIMIT:-256mb}+ memory: ${FLUXER_USERS_MEMORY_LIMIT:-256mb}environment:<<: *fluxer-rust-envFLUXER_SVC_NAME: users- FLUXER_SVC_MODE: shard- FLUXER_SVC_SHARD_ID: "0"- FLUXER_POSTGRES_MAX_CONNECTIONS: "${FLUXER_USERS_SHARD_POSTGRES_MAX_CONNECTIONS:-20}"+ FLUXER_SVC_MODE: combined+ FLUXER_POSTGRES_MAX_CONNECTIONS: "${FLUXER_USERS_POSTGRES_MAX_CONNECTIONS:-20}"healthcheck: *fluxer-svc-healthcheckdepends_on:nats: {condition: service_healthy}@@ -835,27 +803,11 @@ services:deploy:resources:limits:- memory: ${FLUXER_GIFS_MEMORY_LIMIT:-128mb}+ memory: ${FLUXER_GIFS_MEMORY_LIMIT:-256mb}environment:<<: *fluxer-rust-envFLUXER_SVC_NAME: gifs- FLUXER_SVC_MODE: router- healthcheck: *fluxer-svc-healthcheck- depends_on:- nats: {condition: service_healthy}-- gifs-shard:- <<: *fluxer-service- image: ${FLUXER_REGISTRY:-ghcr.io/${FLUXER_REGISTRY_OWNER:-fluxerapp}}/fluxer-gifs:${FLUXER_IMAGE_TAG:-v1}- deploy:- resources:- limits:- memory: ${FLUXER_GIFS_SHARD_MEMORY_LIMIT:-256mb}- environment:- <<: *fluxer-rust-env- FLUXER_SVC_NAME: gifs- FLUXER_SVC_MODE: shard- FLUXER_SVC_SHARD_ID: "0"+ FLUXER_SVC_MODE: combinedFLUXER_GIFS_SHARD_CACHE_MAX_BYTES: ${FLUXER_GIFS_SHARD_CACHE_MAX_BYTES:-134217728}healthcheck: *fluxer-svc-healthcheckdepends_on:@@ -867,28 +819,12 @@ services:deploy:resources:limits:- memory: ${FLUXER_MESSAGES_MEMORY_LIMIT:-128mb}+ memory: ${FLUXER_MESSAGES_MEMORY_LIMIT:-256mb}environment:<<: *fluxer-rust-envFLUXER_SVC_NAME: messages- FLUXER_SVC_MODE: router- healthcheck: *fluxer-svc-healthcheck- depends_on:- nats: {condition: service_healthy}-- messages-shard:- <<: *fluxer-service- image: ${FLUXER_REGISTRY:-ghcr.io/${FLUXER_REGISTRY_OWNER:-fluxerapp}}/fluxer-messages:${FLUXER_IMAGE_TAG:-v1}- deploy:- resources:- limits:- memory: ${FLUXER_MESSAGES_SHARD_MEMORY_LIMIT:-256mb}- environment:- <<: *fluxer-rust-env- FLUXER_SVC_NAME: messages- FLUXER_SVC_MODE: shard- FLUXER_SVC_SHARD_ID: "0"- FLUXER_POSTGRES_MAX_CONNECTIONS: "${FLUXER_MESSAGES_SHARD_POSTGRES_MAX_CONNECTIONS:-20}"+ FLUXER_SVC_MODE: combined+ FLUXER_POSTGRES_MAX_CONNECTIONS: "${FLUXER_MESSAGES_POSTGRES_MAX_CONNECTIONS:-20}"healthcheck: *fluxer-svc-healthcheckdepends_on:nats: {condition: service_healthy}@@ -900,27 +836,11 @@ services:deploy:resources:limits:- memory: ${FLUXER_UNFURL_MEMORY_LIMIT:-128mb}- environment:- <<: *fluxer-rust-env- FLUXER_SVC_NAME: unfurl- FLUXER_SVC_MODE: router- healthcheck: *fluxer-svc-healthcheck- depends_on:- nats: {condition: service_healthy}-- unfurl-shard:- <<: *fluxer-service- image: ${FLUXER_REGISTRY:-ghcr.io/${FLUXER_REGISTRY_OWNER:-fluxerapp}}/fluxer-unfurl:${FLUXER_IMAGE_TAG:-v1}- deploy:- resources:- limits:- memory: ${FLUXER_UNFURL_SHARD_MEMORY_LIMIT:-256mb}+ memory: ${FLUXER_UNFURL_MEMORY_LIMIT:-256mb}environment:<<: *fluxer-rust-envFLUXER_SVC_NAME: unfurl- FLUXER_SVC_MODE: shard- FLUXER_SVC_SHARD_ID: "0"+ FLUXER_SVC_MODE: combinedFLUXER_MEDIA_PROXY_ENDPOINT: http://media-proxy:8080healthcheck: *fluxer-svc-healthcheckdepends_on:diff --git a/fluxer_rexctl/internal/stack/services.go b/fluxer_rexctl/internal/stack/services.goindex 78e064b3d..48aa2a623 100644--- a/fluxer_rexctl/internal/stack/services.go+++ b/fluxer_rexctl/internal/stack/services.go@@ -10,8 +10,7 @@ import (var Services = []string{"edge", "postgres", "valkey", "nats", "meilisearch", "seaweedfs", "seaweedfs-init", "livekit","api", "worker", "gateway", "media-proxy", "push", "static-proxy", "app-proxy", "admin",- "snowflakes", "snowflakes-shard", "users", "users-shard", "gifs", "gifs-shard",- "messages", "messages-shard", "unfurl", "unfurl-shard",+ "snowflakes", "users", "gifs", "messages", "unfurl",}var OneShot = map[string]bool{"seaweedfs-init": true}diff --git a/fluxer_rexctl/internal/stack/sizing.go b/fluxer_rexctl/internal/stack/sizing.goindex 2218c60a9..e5332d1b0 100644--- a/fluxer_rexctl/internal/stack/sizing.go+++ b/fluxer_rexctl/internal/stack/sizing.go@@ -57,10 +57,10 @@ func Sizing(hw Hardware, memory bool, fixed map[string]string) map[string]stringsetInt(out, "FLUXER_MALLOC_ARENA_MAX", max(2, small))setInt(out, "FLUXER_API_POSTGRES_MAX_CONNECTIONS", clamp(2*c, 4, 25))setInt(out, "FLUXER_WORKER_POSTGRES_MAX_CONNECTIONS", clamp(c, 2, 25))- setInt(out, "FLUXER_USERS_SHARD_POSTGRES_MAX_CONNECTIONS", clamp(c, 2, 20))- setInt(out, "FLUXER_MESSAGES_SHARD_POSTGRES_MAX_CONNECTIONS", clamp(c, 2, 20))+ setInt(out, "FLUXER_USERS_POSTGRES_MAX_CONNECTIONS", clamp(c, 2, 20))+ setInt(out, "FLUXER_MESSAGES_POSTGRES_MAX_CONNECTIONS", clamp(c, 2, 20))clients := num("FLUXER_API_POSTGRES_MAX_CONNECTIONS", 25) + num("FLUXER_WORKER_POSTGRES_MAX_CONNECTIONS", 25) +- num("FLUXER_USERS_SHARD_POSTGRES_MAX_CONNECTIONS", 20) + num("FLUXER_MESSAGES_SHARD_POSTGRES_MAX_CONNECTIONS", 20)+ num("FLUXER_USERS_POSTGRES_MAX_CONNECTIONS", 20) + num("FLUXER_MESSAGES_POSTGRES_MAX_CONNECTIONS", 20)setInt(out, "FLUXER_POSTGRES_SERVER_MAX_CONNECTIONS", clients+10)setInt(out, "FLUXER_POSTGRES_AUTOVACUUM_MAX_WORKERS", clamp(c, 1, 3))gather := 0@@ -96,7 +96,7 @@ func Sizing(hw Hardware, memory bool, fixed map[string]string) map[string]stringmedia := share("FLUXER_MEDIA_PROXY_MEMORY_LIMIT", 8, 320, 1024)setBytes(out, "FLUXER_MEDIA_PROXY_TRANSFORM_CACHE_BYTES", media/8)setBytes(out, "FLUXER_MEDIA_PROXY_UPLOAD_RELAY_BUFFERED_RETRY_TOTAL_BYTES", media/4)- setBytes(out, "FLUXER_GIFS_SHARD_CACHE_MAX_BYTES", min(clamp(m/64, 64, 128), size("FLUXER_GIFS_SHARD_MEMORY_LIMIT", 256)/2))+ setBytes(out, "FLUXER_GIFS_SHARD_CACHE_MAX_BYTES", min(clamp(m/64, 64, 128), size("FLUXER_GIFS_MEMORY_LIMIT", 256)/2))out["FLUXER_LIVEKIT_GOMEMLIMIT"] = strconv.Itoa(share("FLUXER_LIVEKIT_MEMORY_LIMIT", 6, 320, 2048)*85/100) + "MiB"out["FLUXER_NATS_GOMEMLIMIT"] = strconv.Itoa(share("FLUXER_NATS_MEMORY_LIMIT", 3, 192, 1024)*4/5) + "MiB"diff --git a/packages/config/scripts/CheckSelfHostEnv.ts b/packages/config/scripts/CheckSelfHostEnv.tsindex f842c5d30..970e28a75 100644--- a/packages/config/scripts/CheckSelfHostEnv.ts+++ b/packages/config/scripts/CheckSelfHostEnv.ts@@ -95,7 +95,7 @@ const INPUT_NAMES: Record<string, string> = {https_proxy: 'HTTPS_PROXY',};-const OWN_POOL_SIZES = new Set(['api', 'worker', 'users-shard', 'messages-shard']);+const OWN_POOL_SIZES = new Set(['api', 'worker', 'users', 'messages']);const OBJECT_STORE_CREDENTIALS = ['FLUXER_S3_ACCESS_KEY', 'FLUXER_S3_SECRET_KEY'];const OBJECT_STORE_CLIENTS = ['api', 'worker', 'media-proxy'];diff --git a/tools/ci/src/image_set.rs b/tools/ci/src/image_set.rsindex 327968259..ab7ca4af7 100644--- a/tools/ci/src/image_set.rs+++ b/tools/ci/src/image_set.rs@@ -58,7 +58,7 @@ const COMPONENTS: &[Component] = &[},Component {image: "fluxer-gifs",- services: &["gifs", "gifs-shard"],+ services: &["gifs"],},Component {image: "fluxer-media-proxy",@@ -66,7 +66,7 @@ const COMPONENTS: &[Component] = &[},Component {image: "fluxer-messages",- services: &["messages", "messages-shard"],+ services: &["messages"],},Component {image: "fluxer-push",@@ -74,7 +74,7 @@ const COMPONENTS: &[Component] = &[},Component {image: "fluxer-snowflakes",- services: &["snowflakes", "snowflakes-shard"],+ services: &["snowflakes"],},Component {image: "fluxer-static",@@ -82,11 +82,11 @@ const COMPONENTS: &[Component] = &[},Component {image: "fluxer-unfurl",- services: &["unfurl", "unfurl-shard"],+ services: &["unfurl"],},Component {image: "fluxer-users",- services: &["users", "users-shard"],+ services: &["users"],},];@@ -981,7 +981,7 @@ mod tests {.lines().filter(|line| line.starts_with(" image: ")).count(),- 18+ 13);let api = manifest