From ecf52f3800d70061461127d95736b419d1b9a32b Mon Sep 17 00:00:00 2001 From: YetAnotherMechanicusEnjoyer Date: Mon, 25 Aug 2025 20:00:09 +0200 Subject: [PATCH 01/24] [RENAME] Rust.yml => rust.yml --- .github/workflows/{Rust.yml => rust.yml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .github/workflows/{Rust.yml => rust.yml} (100%) diff --git a/.github/workflows/Rust.yml b/.github/workflows/rust.yml similarity index 100% rename from .github/workflows/Rust.yml rename to .github/workflows/rust.yml From 7e2d4f3ac2fca12e630013e04612d5227d62b5bc Mon Sep 17 00:00:00 2001 From: YetAnotherMechanicusEnjoyer Date: Mon, 25 Aug 2025 20:00:22 +0200 Subject: [PATCH 02/24] [RENAME] Node.js.yml => node.js.yml --- .github/workflows/{Node.js.yml => node.js.yml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .github/workflows/{Node.js.yml => node.js.yml} (100%) diff --git a/.github/workflows/Node.js.yml b/.github/workflows/node.js.yml similarity index 100% rename from .github/workflows/Node.js.yml rename to .github/workflows/node.js.yml From 643e8e5167bd2050661dcec884d02c296c3df8e5 Mon Sep 17 00:00:00 2001 From: YetAnotherMechanicusEnjoyer Date: Mon, 25 Aug 2025 20:00:34 +0200 Subject: [PATCH 03/24] [ADD] .github/workflows/docker.yml --- .github/workflows/docker.yml | 38 ++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 .github/workflows/docker.yml diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml new file mode 100644 index 0000000..5ffffcf --- /dev/null +++ b/.github/workflows/docker.yml @@ -0,0 +1,38 @@ +name: Docker Compose CI + +on: + push: + pull_request: + branches: ["main"] + +jobs: + build: + runs-on: ubuntu-latest + steps: + - name: Checkout repository + uses: actions/checkout@v4 + + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 + + - name: Build Docker Compose services + run: docker-compose build + + - name: Run Docker Compose services + run: docker-compose up --detach + + - name: Run Trivy vulnerability scan for discord_bot + uses: aquasecurity/trivy-action@master + with: + image-ref: "discord_bot" + format: "table" + exit-code: "1" + severity: "HIGH" + + - name: Run Trivy vulnerability scan for twitch_app + uses: aquasecurity/trivy-action@master + with: + image-ref: "twitch_app" + format: "table" + exit-code: "1" + severity: "HIGH" From 0de5ad160a429d7b74802fcc08528cc4caf71f77 Mon Sep 17 00:00:00 2001 From: YetAnotherMechanicusEnjoyer Date: Mon, 25 Aug 2025 20:01:57 +0200 Subject: [PATCH 04/24] [UPDATE] Docker Compose CI [ADD] Install Docker Compose --- .github/workflows/docker.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 5ffffcf..a831ec5 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -12,6 +12,11 @@ jobs: - name: Checkout repository uses: actions/checkout@v4 + - name: Install Docker Compose + run: | + sudo apt-get update + sudo apt-get install -y docker-compose + - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 From b16c159c0dc8f9ac8537dc39fdba2d4c741c97bd Mon Sep 17 00:00:00 2001 From: YetAnotherMechanicusEnjoyer Date: Mon, 25 Aug 2025 20:06:02 +0200 Subject: [PATCH 05/24] [UPDATE] Docker Compose CI [ADD] secret .env file --- .github/workflows/docker.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index a831ec5..ca0777f 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -12,6 +12,9 @@ jobs: - name: Checkout repository uses: actions/checkout@v4 + - name: Create .env file from secret + run: echo "${{ secrets.PROD_ENV_FILE }}" > .env + - name: Install Docker Compose run: | sudo apt-get update From 73b33a42ba0b82ac00c496a05398ac8eb529a08a Mon Sep 17 00:00:00 2001 From: YetAnotherMechanicusEnjoyer Date: Mon, 25 Aug 2025 20:10:25 +0200 Subject: [PATCH 06/24] [UPDATE] Docker Compose CI [ADD] Compile Discord Dependencies --- .github/workflows/docker.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index ca0777f..abddf76 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -20,6 +20,11 @@ jobs: sudo apt-get update sudo apt-get install -y docker-compose + - name: Compile Discord Dependencies + run: | + cd discord/ + cargo build + - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 From 966d3f4f42a8f00460a5bbb78169d84c43d4310d Mon Sep 17 00:00:00 2001 From: YetAnotherMechanicusEnjoyer Date: Mon, 25 Aug 2025 20:18:27 +0200 Subject: [PATCH 07/24] [UPDATE] docker-compose.yml [ADD] images name --- docker-compose.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docker-compose.yml b/docker-compose.yml index 8fbeb34..6a15f81 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -14,6 +14,7 @@ services: build: context: ./discord dockerfile: Dockerfile + image: synapsebot/discord_bot:latest container_name: synapse_discord_bot restart: on-failure depends_on: @@ -27,6 +28,7 @@ services: build: context: ./twitch dockerfile: Dockerfile + image: synapsebot/twitch_app:latest container_name: synapse_twitch_app restart: on-failure depends_on: From 2a2172abe52a1012ad7df5ec2194e9a7855f645f Mon Sep 17 00:00:00 2001 From: YetAnotherMechanicusEnjoyer Date: Mon, 25 Aug 2025 20:19:20 +0200 Subject: [PATCH 08/24] [FIX] Docker Compose CI [FIX] image-ref names --- .github/workflows/docker.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index abddf76..15ec9d9 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -37,7 +37,7 @@ jobs: - name: Run Trivy vulnerability scan for discord_bot uses: aquasecurity/trivy-action@master with: - image-ref: "discord_bot" + image-ref: "synapsebot/discord_bot:latest" format: "table" exit-code: "1" severity: "HIGH" @@ -45,7 +45,7 @@ jobs: - name: Run Trivy vulnerability scan for twitch_app uses: aquasecurity/trivy-action@master with: - image-ref: "twitch_app" + image-ref: "synapsebot/twitch_app:latest" format: "table" exit-code: "1" severity: "HIGH" From f527b3cfc3ae64a6d3d80c05236fbfa86d24e7ba Mon Sep 17 00:00:00 2001 From: YetAnotherMechanicusEnjoyer Date: Mon, 25 Aug 2025 20:26:20 +0200 Subject: [PATCH 09/24] [UPDATE] discord/Dockerfile [EDIT] image version --- discord/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/discord/Dockerfile b/discord/Dockerfile index f0c51e4..0efb075 100644 --- a/discord/Dockerfile +++ b/discord/Dockerfile @@ -1,4 +1,4 @@ -FROM rust:slim-bookworm AS builder +FROM rust:1.92.0-slim-bookworm AS builder WORKDIR /app @@ -20,7 +20,7 @@ COPY . . RUN cargo build --release --locked -FROM rust:slim-bookworm +FROM rust:1.92.0-slim-bookworm RUN apt-get update && \ apt-get install -y \ From f2605683c88da8eb521313e89f96208e30b67f82 Mon Sep 17 00:00:00 2001 From: YetAnotherMechanicusEnjoyer Date: Mon, 25 Aug 2025 20:29:21 +0200 Subject: [PATCH 10/24] [FIX] discord/Dockerfile [FIX] image version --- discord/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/discord/Dockerfile b/discord/Dockerfile index 0efb075..c0181f2 100644 --- a/discord/Dockerfile +++ b/discord/Dockerfile @@ -1,4 +1,4 @@ -FROM rust:1.92.0-slim-bookworm AS builder +FROM rust:1.88.0-slim-bookworm AS builder WORKDIR /app @@ -20,7 +20,7 @@ COPY . . RUN cargo build --release --locked -FROM rust:1.92.0-slim-bookworm +FROM rust:1.88.0-slim-bookworm RUN apt-get update && \ apt-get install -y \ From d83385c5f9b249f68f743297c01b2a3790360ff5 Mon Sep 17 00:00:00 2001 From: YetAnotherMechanicusEnjoyer Date: Mon, 25 Aug 2025 20:40:41 +0200 Subject: [PATCH 11/24] [UPDATE] Docker Compose CI [REMOVE] Trivy --- .github/workflows/docker.yml | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 15ec9d9..e1d2117 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -23,7 +23,7 @@ jobs: - name: Compile Discord Dependencies run: | cd discord/ - cargo build + cargo build --release - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 @@ -33,19 +33,3 @@ jobs: - name: Run Docker Compose services run: docker-compose up --detach - - - name: Run Trivy vulnerability scan for discord_bot - uses: aquasecurity/trivy-action@master - with: - image-ref: "synapsebot/discord_bot:latest" - format: "table" - exit-code: "1" - severity: "HIGH" - - - name: Run Trivy vulnerability scan for twitch_app - uses: aquasecurity/trivy-action@master - with: - image-ref: "synapsebot/twitch_app:latest" - format: "table" - exit-code: "1" - severity: "HIGH" From 4885bfda0ad51caf058d70bdadc2a6129b679092 Mon Sep 17 00:00:00 2001 From: YetAnotherMechanicusEnjoyer Date: Mon, 25 Aug 2025 20:51:01 +0200 Subject: [PATCH 12/24] [UPDATE] Docker Compose CI [ADD] Cache Cargo build --- .github/workflows/docker.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index e1d2117..caa1e28 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -20,6 +20,18 @@ jobs: sudo apt-get update sudo apt-get install -y docker-compose + - name: Cache Cargo build + uses: actions/cache@v4 + with: + path: | + ~/.cargo/bin/ + ~/.cargo/registry/ + ~/.cargo/git/ + target/ + key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }} + restore-keys: | + ${{ runner.os }}-cargo- + - name: Compile Discord Dependencies run: | cd discord/ From 9dfe1c1fb3c07a84d27be86723607be037a804a2 Mon Sep 17 00:00:00 2001 From: YetAnotherMechanicusEnjoyer Date: Mon, 25 Aug 2025 21:01:19 +0200 Subject: [PATCH 13/24] [UPDATE] .dockerignore [REMOVE] target/ --- discord/.dockerignore | 1 - 1 file changed, 1 deletion(-) diff --git a/discord/.dockerignore b/discord/.dockerignore index cc19318..a8ec88b 100644 --- a/discord/.dockerignore +++ b/discord/.dockerignore @@ -1,2 +1 @@ -target/ Makefile.toml From e20df3aa56fc436d27a07b452b34301119203519 Mon Sep 17 00:00:00 2001 From: YetAnotherMechanicusEnjoyer Date: Mon, 25 Aug 2025 21:09:40 +0200 Subject: [PATCH 14/24] [UPDATE] Docker Compose CI [EDIT] Compile Discord Dependencies => Generate Cargo.lock --- .github/workflows/docker.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index caa1e28..506da0e 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -32,10 +32,10 @@ jobs: restore-keys: | ${{ runner.os }}-cargo- - - name: Compile Discord Dependencies + - name: Generate Cargo.lock run: | cd discord/ - cargo build --release + cargo generate-lockfile - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 From b7f01c1f28006d6190f33f072f3708a74d07971f Mon Sep 17 00:00:00 2001 From: YetAnotherMechanicusEnjoyer Date: Mon, 25 Aug 2025 21:15:34 +0200 Subject: [PATCH 15/24] [UPDATE] Docker Compos CI [REMOVE] Caching --- .github/workflows/docker.yml | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 506da0e..ffe127f 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -6,7 +6,7 @@ on: branches: ["main"] jobs: - build: + docker-ci: runs-on: ubuntu-latest steps: - name: Checkout repository @@ -20,18 +20,6 @@ jobs: sudo apt-get update sudo apt-get install -y docker-compose - - name: Cache Cargo build - uses: actions/cache@v4 - with: - path: | - ~/.cargo/bin/ - ~/.cargo/registry/ - ~/.cargo/git/ - target/ - key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }} - restore-keys: | - ${{ runner.os }}-cargo- - - name: Generate Cargo.lock run: | cd discord/ From 43addc4f99a0bec800ab76f7701817afbfb09be4 Mon Sep 17 00:00:00 2001 From: YetAnotherMechanicusEnjoyer Date: Mon, 25 Aug 2025 21:28:42 +0200 Subject: [PATCH 16/24] [UPDATE] Docker Compose CI [ADD] run-name --- .github/workflows/docker.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index ffe127f..ff6603d 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -1,5 +1,7 @@ name: Docker Compose CI +run-name: Docker Compose CI | ${{ github.event_name == 'push' && github.event.head_commit.message || github.event_name == 'pull_request' && github.event.pull_request.title }} by @{{ github.actor }} on ${{ github.ref_name }} + on: push: pull_request: From 4ff201f720dc19a480f9b0fbd2feda10bf1b6bd2 Mon Sep 17 00:00:00 2001 From: YetAnotherMechanicusEnjoyer Date: Mon, 25 Aug 2025 21:28:53 +0200 Subject: [PATCH 17/24] [UPDATE] Node.js CI [ADD] run-name --- .github/workflows/node.js.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml index 98803d7..59f5124 100644 --- a/.github/workflows/node.js.yml +++ b/.github/workflows/node.js.yml @@ -1,5 +1,7 @@ name: Node.js CI +run-name: Node.js CI | ${{ github.event_name == 'push' && github.event.head_commit.message || github.event_name == 'pull_request' && github.event.pull_request.title }} by @{{ github.actor }} on ${{ github.ref_name }} + on: push: pull_request: From d0b868cc6788b3a6bcbd5a8144242ef5834626b5 Mon Sep 17 00:00:00 2001 From: YetAnotherMechanicusEnjoyer Date: Mon, 25 Aug 2025 21:29:03 +0200 Subject: [PATCH 18/24] [UPDATE] Rust CI [ADD] run-name --- .github/workflows/rust.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 6b7c36a..21c7292 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -1,5 +1,7 @@ name: Rust CI +run-name: Rust CI | ${{ github.event_name == 'push' && github.event.head_commit.message || github.event_name == 'pull_request' && github.event.pull_request.title }} by @{{ github.actor }} on ${{ github.ref_name }} + on: push: pull_request: From b1fb230c1a88c906dd2ec27fd6139825da4c2782 Mon Sep 17 00:00:00 2001 From: YetAnotherMechanicusEnjoyer Date: Mon, 25 Aug 2025 21:34:53 +0200 Subject: [PATCH 19/24] [UPDATE] Docker Compose CI [EDIT] run-name --- .github/workflows/docker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index ff6603d..2511092 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -1,6 +1,6 @@ name: Docker Compose CI -run-name: Docker Compose CI | ${{ github.event_name == 'push' && github.event.head_commit.message || github.event_name == 'pull_request' && github.event.pull_request.title }} by @{{ github.actor }} on ${{ github.ref_name }} +run-name: Docker Compose CI | ${{ github.event_name == 'push' && split(github.event.head_commit.message, '\n')[0] || github.event_name == 'pull_request' && github.event.pull_request.title }} by ${{ github.actor }} on '${{ github.ref_name }}' on: push: From 2ee922587ff86a899dbe2d611edb7ecfb448dda7 Mon Sep 17 00:00:00 2001 From: YetAnotherMechanicusEnjoyer Date: Mon, 25 Aug 2025 21:35:05 +0200 Subject: [PATCH 20/24] [UPDATE] Node.js CI [EDIT] run-name --- .github/workflows/node.js.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml index 59f5124..312ef43 100644 --- a/.github/workflows/node.js.yml +++ b/.github/workflows/node.js.yml @@ -1,6 +1,6 @@ name: Node.js CI -run-name: Node.js CI | ${{ github.event_name == 'push' && github.event.head_commit.message || github.event_name == 'pull_request' && github.event.pull_request.title }} by @{{ github.actor }} on ${{ github.ref_name }} +run-name: Node.js CI | ${{ github.event_name == 'push' && split(github.event.head_commit.message, '\n')[0] || github.event_name == 'pull_request' && github.event.pull_request.title }} by ${{ github.actor }} on '${{ github.ref_name }}' on: push: From 7fbb68861bb850ccbf61f132a574871f097f2788 Mon Sep 17 00:00:00 2001 From: YetAnotherMechanicusEnjoyer Date: Mon, 25 Aug 2025 21:35:16 +0200 Subject: [PATCH 21/24] [UPDATE] Rust CI [EDIT] run-name --- .github/workflows/rust.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 21c7292..dad8771 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -1,6 +1,6 @@ name: Rust CI -run-name: Rust CI | ${{ github.event_name == 'push' && github.event.head_commit.message || github.event_name == 'pull_request' && github.event.pull_request.title }} by @{{ github.actor }} on ${{ github.ref_name }} +run-name: Rust CI | ${{ github.event_name == 'push' && split(github.event.head_commit.message, '\n')[0] || github.event_name == 'pull_request' && github.event.pull_request.title }} by ${{ github.actor }} on '${{ github.ref_name }}' on: push: From b3b79b7eece2498e594e943b7b1df2e1852e289f Mon Sep 17 00:00:00 2001 From: YetAnotherMechanicusEnjoyer Date: Mon, 25 Aug 2025 21:41:31 +0200 Subject: [PATCH 22/24] [UPDATE] Docker Compose CI [FIX] run-name --- .github/workflows/docker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 2511092..5d8a320 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -1,6 +1,6 @@ name: Docker Compose CI -run-name: Docker Compose CI | ${{ github.event_name == 'push' && split(github.event.head_commit.message, '\n')[0] || github.event_name == 'pull_request' && github.event.pull_request.title }} by ${{ github.actor }} on '${{ github.ref_name }}' +run-name: Docker Compose CI | ${{ github.event_name }} by ${{ github.actor }} on '${{ github.ref_name }}' on: push: From eaaecd308f82fca091ba65599d8c209768b7f6d9 Mon Sep 17 00:00:00 2001 From: YetAnotherMechanicusEnjoyer Date: Mon, 25 Aug 2025 21:41:45 +0200 Subject: [PATCH 23/24] [UPDATE] Node.js CI [FIX] run-name --- .github/workflows/node.js.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml index 312ef43..7cb5acc 100644 --- a/.github/workflows/node.js.yml +++ b/.github/workflows/node.js.yml @@ -1,6 +1,6 @@ name: Node.js CI -run-name: Node.js CI | ${{ github.event_name == 'push' && split(github.event.head_commit.message, '\n')[0] || github.event_name == 'pull_request' && github.event.pull_request.title }} by ${{ github.actor }} on '${{ github.ref_name }}' +run-name: Node.js CI | ${{ github.event_name }} by ${{ github.actor }} on '${{ github.ref_name }}' on: push: From e9652f6c53290b627cb950f63046e93157c7804b Mon Sep 17 00:00:00 2001 From: YetAnotherMechanicusEnjoyer Date: Mon, 25 Aug 2025 21:41:55 +0200 Subject: [PATCH 24/24] [UPDATE] Rust CI [FIX] run-name --- .github/workflows/rust.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index dad8771..45c6ecd 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -1,6 +1,6 @@ name: Rust CI -run-name: Rust CI | ${{ github.event_name == 'push' && split(github.event.head_commit.message, '\n')[0] || github.event_name == 'pull_request' && github.event.pull_request.title }} by ${{ github.actor }} on '${{ github.ref_name }}' +run-name: Rust CI | ${{ github.event_name }} by ${{ github.actor }} on '${{ github.ref_name }}' on: push: