fix(ci): add voice-ingress to compose

chore(ci): move to stoatchat
Merge branch 'main' into feat/livekit
2025-10-11 23:46:13 +01:00 · 2025-10-11 23:22:41 +01:00 · 2025-10-11 23:09:07 +01:00 · 2025-10-11 23:01:35 +01:00 · 2025-10-11 22:22:11 +01:00 · 2025-10-09 01:32:17 +01:00
15 changed files with 70 additions and 61 deletions
@@ -49,13 +49,6 @@ jobs:
        uses: docker/setup-buildx-action@v2

      # Authenticate with Docker Hub and GHCR
-      - name: Login to DockerHub
-        uses: docker/login-action@v2
-        with:
-          registry: docker.io
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-
      - name: Login to Github Container Registry
        uses: docker/login-action@v2
        with:
@@ -72,14 +65,13 @@ jobs:
          platforms: linux/amd64,linux/arm64
          tags: ghcr.io/${{ github.repository_owner }}/base:latest

-      # revoltchat/server
+      # stoatchat/api
      - name: Docker meta
        id: meta-delta
        uses: docker/metadata-action@v4
        with:
          images: |
-            docker.io/revoltchat/server
-            ghcr.io/revoltchat/server
+            ghcr.io/stoatchat/api
      - name: Publish
        uses: docker/build-push-action@v4
        with:
@@ -92,14 +84,13 @@ jobs:
            BASE_IMAGE=ghcr.io/${{ github.repository_owner }}/base:latest
          labels: ${{ steps.meta-delta.outputs.labels }}

-      # revoltchat/bonfire
+      # stoatchat/events
      - name: Docker meta
        id: meta-bonfire
        uses: docker/metadata-action@v4
        with:
          images: |
-            docker.io/revoltchat/bonfire
-            ghcr.io/revoltchat/bonfire
+            ghcr.io/stoatchat/events
      - name: Publish
        uses: docker/build-push-action@v4
        with:
@@ -112,14 +103,13 @@ jobs:
            BASE_IMAGE=ghcr.io/${{ github.repository_owner }}/base:latest
          labels: ${{ steps.meta-bonfire.outputs.labels }}

-      # revoltchat/autumn
+      # stoatchat/file-server
      - name: Docker meta
        id: meta-autumn
        uses: docker/metadata-action@v4
        with:
          images: |
-            docker.io/revoltchat/autumn
-            ghcr.io/revoltchat/autumn
+            ghcr.io/stoatchat/file-server
      - name: Publish
        uses: docker/build-push-action@v4
        with:
@@ -132,14 +122,13 @@ jobs:
            BASE_IMAGE=ghcr.io/${{ github.repository_owner }}/base:latest
          labels: ${{ steps.meta-autumn.outputs.labels }}

-      # revoltchat/january
+      # stoatchat/proxy
      - name: Docker meta
        id: meta-january
        uses: docker/metadata-action@v4
        with:
          images: |
-            docker.io/revoltchat/january
-            ghcr.io/revoltchat/january
+            ghcr.io/stoatchat/proxy
      - name: Publish
        uses: docker/build-push-action@v4
        with:
@@ -152,14 +141,13 @@ jobs:
            BASE_IMAGE=ghcr.io/${{ github.repository_owner }}/base:latest
          labels: ${{ steps.meta-january.outputs.labels }}

-      # revoltchat/gifbox
+      # stoatchat/gifbox
      - name: Docker meta
        id: meta-gifbox
        uses: docker/metadata-action@v4
        with:
          images: |
-            docker.io/revoltchat/gifbox
-            ghcr.io/revoltchat/gifbox
+            ghcr.io/stoatchat/gifbox
      - name: Publish
        uses: docker/build-push-action@v4
        with:
@@ -172,14 +160,13 @@ jobs:
            BASE_IMAGE=ghcr.io/${{ github.repository_owner }}/base:latest
          labels: ${{ steps.meta-gifbox.outputs.labels }}

-      # revoltchat/crond
+      # stoatchat/crond
      - name: Docker meta
        id: meta-crond
        uses: docker/metadata-action@v4
        with:
          images: |
-            docker.io/revoltchat/crond
-            ghcr.io/revoltchat/crond
+            ghcr.io/stoatchat/crond
      - name: Publish
        uses: docker/build-push-action@v4
        with:
@@ -192,14 +179,13 @@ jobs:
            BASE_IMAGE=ghcr.io/${{ github.repository_owner }}/base:latest
          labels: ${{ steps.meta-crond.outputs.labels }}

-      # revoltchat/pushd
+      # stoatchat/pushd
      - name: Docker meta
        id: meta-pushd
        uses: docker/metadata-action@v4
        with:
          images: |
-            docker.io/revoltchat/pushd
-            ghcr.io/revoltchat/pushd
+            ghcr.io/stoatchat/pushd
      - name: Publish
        uses: docker/build-push-action@v4
        with:
@@ -211,3 +197,22 @@ jobs:
          build-args: |
            BASE_IMAGE=ghcr.io/${{ github.repository_owner }}/base:latest
          labels: ${{ steps.meta-pushd.outputs.labels }}
+
+      # stoatchat/voice-ingress
+      - name: Docker meta
+        id: meta-voice-ingress
+        uses: docker/metadata-action@v4
+        with:
+          images: |
+            ghcr.io/stoatchat/voice-ingress
+      - name: Publish
+        uses: docker/build-push-action@v4
+        with:
+          context: .
+          push: true
+          platforms: linux/amd64,linux/arm64
+          file: crates/daemons/voice-ingress/Dockerfile
+          tags: ${{ steps.meta-voice-ingress.outputs.tags }}
+          build-args: |
+            BASE_IMAGE=ghcr.io/${{ github.repository_owner }}/base:latest
+          labels: ${{ steps.meta-voice-ingress.outputs.labels }}
@@ -73,7 +73,7 @@ jobs:
        if: github.event_name != 'pull_request' && github.ref_name == 'main'
        uses: actions/checkout@v3
        with:
-          repository: revoltchat/api
+          repository: stoatchat/api
          path: api
          token: ${{ secrets.PAT }}

@@ -14,7 +14,7 @@ jobs:
        run: |
          gh api graphql -f query='
            query {
-              organization(login: "revoltchat"){
+              organization(login: "stoatchat"){
                projectV2(number: 3) {
                  id
                  fields(first:20) {
@@ -14,7 +14,7 @@ jobs:
        run: |
          gh api graphql -f query='
            query {
-              organization(login: "revoltchat"){
+              organization(login: "stoatchat"){
                projectV2(number: 5) {
                  id
                  fields(first:20) {
@@ -1,5 +1,5 @@
 # Build Stage
-FROM ghcr.io/revoltchat/base:latest AS builder
+FROM ghcr.io/stoatchat/base:latest AS builder
 FROM debian:12 AS debian

 # Bundle Stage
@@ -412,7 +412,9 @@ pub async fn sync_voice_permissions(
    server: Option<&Server>,
    role_id: Option<&str>,
 ) -> Result<()> {
-    let node = get_channel_node(channel.id()).await?.unwrap();
+    let Some(node) = get_channel_node(channel.id()).await? else {
+        return Ok(());
+    };

    for user_id in get_voice_channel_members(channel.id())
        .await?
@@ -454,9 +456,9 @@ pub async fn sync_user_voice_permissions(
            .as_ref()
            .is_none_or(|member| member.roles.iter().any(|r| r == role_id))
    }) {
-        let voice_state = get_voice_state(channel_id, server_id, &user.id)
-            .await?
-            .unwrap();
+        let Some(voice_state) = get_voice_state(channel_id, server_id, &user.id).await? else {
+            return Ok(());
+        };

        let mut query = DatabasePermissionQuery::new(db, user)
            .channel(channel)
@@ -232,7 +232,9 @@ impl<T, E: std::fmt::Debug> ToRevoltError<T> for Result<T, E> {
        let loc = Location::caller();

        self
-            .map_err(|_| {
+            .map_err(|e| {
+                log::error!("{e:?}");
+
                Error {
                    error_type: ErrorType::InternalError,
                    location: format!("{}:{}:{}", loc.file(), loc.line(), loc.column())
@@ -1,5 +1,5 @@
 # Build Stage
-FROM ghcr.io/revoltchat/base:latest AS builder
+FROM ghcr.io/stoatchat/base:latest AS builder
 FROM debian:12 AS debian

 # Bundle Stage
@@ -1,5 +1,5 @@
 # Build Stage
-FROM ghcr.io/revoltchat/base:latest AS builder
+FROM ghcr.io/stoatchat/base:latest AS builder
 FROM debian:12 AS debian

 # Bundle Stage
@@ -1,5 +1,5 @@
 # Build Stage
-FROM ghcr.io/revoltchat/base:latest AS builder
+FROM ghcr.io/stoatchat/base:latest AS builder
 FROM debian:12 AS debian

 # Bundle Stage
@@ -1,5 +1,5 @@
 # Build Stage
-FROM ghcr.io/revoltchat/base:latest AS builder
+FROM ghcr.io/stoatchat/base:latest AS builder
 FROM debian:12 AS debian

 # Bundle Stage
@@ -1,5 +1,5 @@
 # Build Stage
-FROM ghcr.io/revoltchat/base:latest AS builder
+FROM ghcr.io/stoatchat/base:latest AS builder
 FROM debian:12 AS debian

 # Bundle Stage
@@ -1,5 +1,5 @@
 # Build Stage
-FROM ghcr.io/revoltchat/base:latest AS builder
+FROM ghcr.io/stoatchat/base:latest AS builder

 # Bundle Stage
 FROM gcr.io/distroless/cc-debian12:nonroot
@@ -1,5 +1,5 @@
 # Build Stage
-FROM ghcr.io/revoltchat/base:latest AS builder
+FROM ghcr.io/stoatchat/base:latest AS builder
 FROM debian:12 AS debian

 # Bundle Stage
@@ -20,25 +20,25 @@ fi

 TAG=$1-debug
 echo "Building images, will tag for ghcr.io with $TAG!"
-docker build -t ghcr.io/revoltchat/base:latest -f Dockerfile.useCurrentArch .
-docker build -t ghcr.io/revoltchat/server:$TAG - < crates/delta/Dockerfile
-docker build -t ghcr.io/revoltchat/bonfire:$TAG - < crates/bonfire/Dockerfile
-docker build -t ghcr.io/revoltchat/autumn:$TAG - < crates/services/autumn/Dockerfile
-docker build -t ghcr.io/revoltchat/january:$TAG - < crates/services/january/Dockerfile
-docker build -t ghcr.io/revoltchat/gifbox:$TAG - < crates/services/gifbox/Dockerfile
-docker build -t ghcr.io/revoltchat/crond:$TAG - < crates/daemons/crond/Dockerfile
-docker build -t ghcr.io/revoltchat/pushd:$TAG - < crates/daemons/pushd/Dockerfile
-docker build -t ghcr.io/revoltchat/voice-ingress:$TAG - < crates/daemons/voice-ingress/Dockerfile
+docker build -t ghcr.io/stoatchat/base:latest -f Dockerfile.useCurrentArch .
+docker build -t ghcr.io/stoatchat/server:$TAG - < crates/delta/Dockerfile
+docker build -t ghcr.io/stoatchat/bonfire:$TAG - < crates/bonfire/Dockerfile
+docker build -t ghcr.io/stoatchat/autumn:$TAG - < crates/services/autumn/Dockerfile
+docker build -t ghcr.io/stoatchat/january:$TAG - < crates/services/january/Dockerfile
+docker build -t ghcr.io/stoatchat/gifbox:$TAG - < crates/services/gifbox/Dockerfile
+docker build -t ghcr.io/stoatchat/crond:$TAG - < crates/daemons/crond/Dockerfile
+docker build -t ghcr.io/stoatchat/pushd:$TAG - < crates/daemons/pushd/Dockerfile
+docker build -t ghcr.io/stoatchat/voice-ingress:$TAG - < crates/daemons/voice-ingress/Dockerfile

 if [ "$DEBUG" = "true" ]; then
  git restore Cargo.toml
 fi

-docker push ghcr.io/revoltchat/server:$TAG
-docker push ghcr.io/revoltchat/bonfire:$TAG
-docker push ghcr.io/revoltchat/autumn:$TAG
-docker push ghcr.io/revoltchat/january:$TAG
-docker push ghcr.io/revoltchat/gifbox:$TAG
-docker push ghcr.io/revoltchat/crond:$TAG
-docker push ghcr.io/revoltchat/pushd:$TAG
-docker push ghcr.io/revoltchat/voice-ingress:$TAG
+docker push ghcr.io/stoatchat/server:$TAG
+docker push ghcr.io/stoatchat/bonfire:$TAG
+docker push ghcr.io/stoatchat/autumn:$TAG
+docker push ghcr.io/stoatchat/january:$TAG
+docker push ghcr.io/stoatchat/gifbox:$TAG
+docker push ghcr.io/stoatchat/crond:$TAG
+docker push ghcr.io/stoatchat/pushd:$TAG
+docker push ghcr.io/stoatchat/voice-ingress:$TAG
Author	SHA1	Message	Date
Zomatree	94d7320e70	fix(ci): add voice-ingress to compose	2025-10-11 23:46:13 +01:00
Zomatree	af78ac0586	chore(ci): move to stoatchat	2025-10-11 23:22:41 +01:00
Zomatree	a42ddcbbfa	Merge branch 'main' into feat/livekit	2025-10-11 23:09:07 +01:00
Zomatree	d65c1a1ab3	fix(ci): publish images under stoatchat and remove docker hub	2025-10-11 23:01:35 +01:00
Zomatree	530264f747	chore: add error logging to internal errors	2025-10-11 22:22:11 +01:00
Zomatree	ae1d4dd264	fix: dont presume channel has a node	2025-10-09 01:32:17 +01:00
izzy	4fb99e3bd0	ci: also include gifbox src	2025-09-23 12:12:33 -05:00
izzy	f0a83abcfa	ci: add missing src copies for Docker build	2025-09-23 12:09:19 -05:00
izzy	6f1c715b8c	chore: bump version to 0.8.9	2025-09-23 12:02:35 -05:00