From 07ea7afb9e99169c0130990bc5a195b430adb2a9 Mon Sep 17 00:00:00 2001
From: MrLetsplay <mr@cringe-studios.com>
Date: Tue, 4 Mar 2025 22:22:13 +0100
Subject: [PATCH] Update workflow

---
 .gitea/workflows/build_linux_docker.yml | 13 ++-----------
 dockerbuild/Dockerfile                  |  1 +
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/.gitea/workflows/build_linux_docker.yml b/.gitea/workflows/build_linux_docker.yml
index abcd8c57..4c679875 100644
--- a/.gitea/workflows/build_linux_docker.yml
+++ b/.gitea/workflows/build_linux_docker.yml
@@ -7,24 +7,15 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v3
         
-      - name: Install dependencies
-        run: >
-          apt update && apt install -y curl wget gpg &&
-          mkdir -p /etc/apt/keyrings &&
-          (curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg) &&
-          (echo 'deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_20.x nodistro main' | tee /etc/apt/sources.list.d/nodesource.list) &&
-          apt update && apt install -y nodejs && npm install -g yarn
-        
       - name: Download Cringe Studios configuration
         run: "mkdir cringe && wget -O cringe/config.json https://chat.cringe-studios.com/config.json"
         
       - name: Docker setup
-        run: "yarn run docker:setup"
+        run: "docker build --platform linux/amd64 -t element-desktop-dockerbuild -f dockerbuild/Dockerfile ."
         
       - name: Docker build
         run: >
-          scripts/in-docker.sh bash -c 'dpkg --add-architecture i386 && apt update && apt install -y rpm wine mono-devel &&
-          ls -la &&
+          ls -la && scripts/in-docker.sh bash -c 'ls -la &&
           yarn add matrix-seshat &&
           yarn &&
           yarn run fetch --noverify --cfgdir cringe &&
diff --git a/dockerbuild/Dockerfile b/dockerbuild/Dockerfile
index ecd61fc5..5a003d76 100644
--- a/dockerbuild/Dockerfile
+++ b/dockerbuild/Dockerfile
@@ -14,6 +14,7 @@ RUN apt-get -qq update && apt-get -y -qq dist-upgrade && \
   # Used by seshat (when not SQLCIPHER_STATIC) \
   libsqlcipher-dev && \
   apt-get purge -y --auto-remove && rm -rf /var/lib/apt/lists/*
+RUN dpkg --add-architecture i386 && apt-get update && apt-get install -y wine mono-devel rpm
 RUN ln -s /usr/bin/python3 /usr/bin/python & ln -s /usr/bin/pip3 /usr/bin/pip
 
 ENV DEBUG_COLORS=true