From 381074fce1f3e405d8c527a672f524c4700aead5 Mon Sep 17 00:00:00 2001
From: Fijxu <fijxu@nadeko.net>
Date: Thu, 15 May 2025 19:38:21 -0400
Subject: [PATCH] CI: Replace Dockerfile path depending of the os used

---
 .github/workflows/ci.yml | 10 +++++---
 docker-compose-arm64.yml | 55 ----------------------------------------
 2 files changed, 6 insertions(+), 59 deletions(-)
 delete mode 100644 docker-compose-arm64.yml

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index d3b6455a..7a5e8850 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -87,11 +87,9 @@ jobs:
       matrix:
         include:
           - os: ubuntu-latest
-            docker_compose_file: "docker-compose.yml"
             name: "AMD64"
             # GitHub doesn't have a ubuntu-latest-arm runner
           - os: ubuntu-24.04-arm
-            docker_compose_file: "docker-compose-arm64.yml"
             name: "ARM64"
 
     name: Test ${{ matrix.name }} Docker build
@@ -100,11 +98,15 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
+      - name: Use ARM64 Dockerfile if ARM64
+        if: ${{ matrix.name }} == "ARM64"
+        run: sed -i 's/Dockerfile/Dockerfile.arm64/' docker-compose.yml
+
       - name: Build Docker
-        run: docker compose -f ${{ matrix.docker_compose_file }} build
+        run: docker compose build
 
       - name: Run Docker
-        run: docker compose -f ${{ matrix.docker_compose_file }} up -d
+        run: docker compose up -d
 
       - name: Test Docker
         run: while curl -Isf http://localhost:3000; do sleep 1; done
diff --git a/docker-compose-arm64.yml b/docker-compose-arm64.yml
deleted file mode 100644
index ba9e0a3f..00000000
--- a/docker-compose-arm64.yml
+++ /dev/null
@@ -1,55 +0,0 @@
-# Warning: This docker-compose file is made for development purposes.
-# Using it will build an image from the locally cloned repository.
-#
-# If you want to use Invidious in production, see the docker-compose.yml file provided
-# in the installation documentation: https://docs.invidious.io/installation/
-
-version: "3"
-services:
-
-  invidious:
-    build:
-      context: .
-      dockerfile: docker/Dockerfile.arm64
-    restart: unless-stopped
-    ports:
-      - "127.0.0.1:3000:3000"
-    environment:
-      # Please read the following file for a comprehensive list of all available
-      # configuration options and their associated syntax:
-      # https://github.com/iv-org/invidious/blob/master/config/config.example.yml
-      INVIDIOUS_CONFIG: |
-        db:
-          dbname: invidious
-          user: kemal
-          password: kemal
-          host: invidious-db
-          port: 5432
-        check_tables: true
-        # external_port:
-        # domain:
-        # https_only: false
-        # statistics_enabled: false
-        hmac_key: "CHANGE_ME!!"
-    healthcheck:
-      test: wget -nv --tries=1 --spider http://127.0.0.1:3000/api/v1/trending || exit 1
-      interval: 30s
-      timeout: 5s
-      retries: 2
-
-  invidious-db:
-    image: docker.io/library/postgres:14
-    restart: unless-stopped
-    volumes:
-      - postgresdata:/var/lib/postgresql/data
-      - ./config/sql:/config/sql
-      - ./docker/init-invidious-db.sh:/docker-entrypoint-initdb.d/init-invidious-db.sh
-    environment:
-      POSTGRES_DB: invidious
-      POSTGRES_USER: kemal
-      POSTGRES_PASSWORD: kemal
-    healthcheck:
-      test: ["CMD-SHELL", "pg_isready -U $$POSTGRES_USER -d $$POSTGRES_DB"]
-
-volumes:
-  postgresdata: