CI: Replace Dockerfile path depending of the os used

CI: Also use matrix.docker_compose_file for Run Docker step
CI: Add name attribute to build-docker job
2025-05-31 14:11:54 +05:30 · 2025-05-15 19:38:21 -04:00 · 2025-05-15 17:58:24 -04:00 · 2025-05-15 17:43:03 -04:00 · 2025-05-15 16:33:03 -04:00 · 2025-05-15 15:31:17 -04:00
3 changed files with 56 additions and 97 deletions
--- a/.github/workflows/build-nightly-container.yml
+++ b/.github/workflows/build-nightly-container.yml
@@ -17,17 +17,27 @@ on:

 jobs:
  release:
-    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        include:
+          - os: ubuntu-latest
+            platform: linux/amd64
+            name: "AMD64"
+            dockerfile: "docker/Dockerfile"
+            tag_suffix: ""
+            # GitHub doesn't have a ubuntu-latest-arm runner
+          - os: ubuntu-24.04-arm
+            platform: linux/arm64/v8
+            name: "ARM64"
+            dockerfile: "docker/Dockerfile.arm64"
+            tag_suffix: "-arm64"
+
+    runs-on: ${{ matrix.os }}

    steps:
      - name: Checkout
        uses: actions/checkout@v4

-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-        with:
-          platforms: arm64
-
      - name: Set up Docker Buildx
        uses: docker/setup-buildx-action@v3

@@ -43,45 +53,22 @@ jobs:
        uses: docker/metadata-action@v5
        with:
          images: quay.io/invidious/invidious
+          flavor: |
+            suffix=${{ matrix.tag_suffix }}
          tags: |
            type=sha,format=short,prefix={{date 'YYYY.MM.DD'}}-,enable=${{ github.ref == format('refs/heads/{0}', 'master') }}
            type=raw,value=master,enable=${{ github.ref == format('refs/heads/{0}', 'master') }}
          labels: |
            quay.expires-after=12w

-      - name: Build and push Docker AMD64 image for Push Event
+      - name: Build and push Docker ${{ matrix.name }} image for Push Event
        uses: docker/build-push-action@v6
        with:
          context: .
-          file: docker/Dockerfile
-          platforms: linux/amd64
+          file:  ${{ matrix.dockerfile }}
+          platforms: ${{ matrix.platform }}
          labels: ${{ steps.meta.outputs.labels }}
          push: true
          tags: ${{ steps.meta.outputs.tags }}
          build-args: |
            "release=1"
-
-      - name: Docker meta
-        id: meta-arm64
-        uses: docker/metadata-action@v5
-        with:
-          images: quay.io/invidious/invidious
-          flavor: |
-            suffix=-arm64
-          tags: |
-            type=sha,format=short,prefix={{date 'YYYY.MM.DD'}}-,enable=${{ github.ref == format('refs/heads/{0}', 'master') }}
-            type=raw,value=master,enable=${{ github.ref == format('refs/heads/{0}', 'master') }}
-          labels: |
-            quay.expires-after=12w
-
-      - name: Build and push Docker ARM64 image for Push Event
-        uses: docker/build-push-action@v6
-        with:
-          context: .
-          file: docker/Dockerfile.arm64
-          platforms: linux/arm64/v8
-          labels: ${{ steps.meta-arm64.outputs.labels }}
-          push: true
-          tags: ${{ steps.meta-arm64.outputs.tags }}
-          build-args: |
-            "release=1"
--- a/.github/workflows/build-stable-container.yml
+++ b/.github/workflows/build-stable-container.yml
@@ -8,17 +8,27 @@ on:

 jobs:
  release:
-    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        include:
+          - os: ubuntu-latest
+            platform: linux/amd64
+            name: "AMD64"
+            dockerfile: "docker/Dockerfile"
+            tag_suffix: ""
+            # GitHub doesn't have a ubuntu-latest-arm runner
+          - os: ubuntu-24.04-arm
+            platform: linux/arm64/v8
+            name: "ARM64"
+            dockerfile: "docker/Dockerfile.arm64"
+            tag_suffix: "-arm64"
+
+    runs-on: ${{ matrix.os }}

    steps:
      - name: Checkout
        uses: actions/checkout@v4

-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-        with:
-          platforms: arm64
-
      - name: Set up Docker Buildx
        uses: docker/setup-buildx-action@v3

@@ -36,46 +46,21 @@ jobs:
          images: quay.io/invidious/invidious
          flavor: |
            latest=false
+            suffix=${{ matrix.tag_suffix }}
          tags: |
            type=semver,pattern={{version}}
            type=raw,value=latest
          labels: |
            quay.expires-after=12w

-      - name: Build and push Docker AMD64 image for Push Event
+      - name: Build and push Docker ${{ matrix.name }} image for Push Event
        uses: docker/build-push-action@v6
        with:
          context: .
-          file: docker/Dockerfile
-          platforms: linux/amd64
+          file:  ${{ matrix.dockerfile }}
+          platforms: ${{ matrix.platform }}
          labels: ${{ steps.meta.outputs.labels }}
          push: true
          tags: ${{ steps.meta.outputs.tags }}
          build-args: |
            "release=1"
-
-      - name: Docker meta
-        id: meta-arm64
-        uses: docker/metadata-action@v5
-        with:
-          images: quay.io/invidious/invidious
-          flavor: |
-            latest=false
-            suffix=-arm64
-          tags: |
-            type=semver,pattern={{version}}
-            type=raw,value=latest
-          labels: |
-            quay.expires-after=12w
-
-      - name: Build and push Docker ARM64 image for Push Event
-        uses: docker/build-push-action@v6
-        with:
-          context: .
-          file: docker/Dockerfile.arm64
-          platforms: linux/arm64/v8
-          labels: ${{ steps.meta-arm64.outputs.labels }}
-          push: true
-          tags: ${{ steps.meta-arm64.outputs.tags }}
-          build-args: |
-            "release=1"
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -83,14 +83,27 @@ jobs:
        run: crystal build --warnings all --error-on-warnings --error-trace src/invidious.cr

  build-docker:
+    strategy:
+      matrix:
+        include:
+          - os: ubuntu-latest
+            name: "AMD64"
+            # GitHub doesn't have a ubuntu-latest-arm runner
+          - os: ubuntu-24.04-arm
+            name: "ARM64"

-    runs-on: ubuntu-latest
+    name: Test ${{ matrix.name }} Docker build
+    runs-on: ${{ matrix.os }}

    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 build --build-arg release=0
+        run: docker compose build

      - name: Run Docker
        run: docker compose up -d
@@ -98,32 +111,6 @@ jobs:
      - name: Test Docker
        run: while curl -Isf http://localhost:3000; do sleep 1; done

-  build-docker-arm64:
-
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-        with:
-          platforms: arm64
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Build Docker ARM64 image
-        uses: docker/build-push-action@v6
-        with:
-          context: .
-          file: docker/Dockerfile.arm64
-          platforms: linux/arm64/v8
-          build-args: release=0
-
-      - name: Test Docker
-        run: while curl -Isf http://localhost:3000; do sleep 1; done
-
  lint:

    runs-on: ubuntu-latest
Author	SHA1	Message	Date
Fijxu	381074fce1	CI: Replace Dockerfile path depending of the os used	2025-05-15 19:38:21 -04:00
Fijxu	033a44fab5	CI: Also use `matrix.docker_compose_file` for `Run Docker` step	2025-05-15 17:58:24 -04:00
Fijxu	a3375e512e	CI: Add name attribute to `build-docker` job	2025-05-15 17:43:03 -04:00
Fijxu	1d664c759f	CI: Use matrix for `build-docker` on ci.yml	2025-05-15 16:33:03 -04:00
Fijxu	94f0a7a9d2	CI: remove --build-arg Dockerfile and Dockerfile.arm64 already build Invidious without release mode if `release` argument is not present.	2025-05-15 15:31:17 -04:00
Fijxu	1d2f4b6813	CI: fix typo on comment about the os used on the ARM64 builder	2025-05-15 15:29:24 -04:00
Fijxu	cef0097a30	CI: fix typo on matrix platforms	2025-05-15 15:28:14 -04:00
Fijxu	bef2d7b6b5	CI: Use public ARM64 Github actions runners for ARM64 builds. Currently, Invidious uses QEMU to build it's ARM64 Invidious image, which is slow (since we are basically using a virtual machine). This helps with the speed of building ARM64 binaries for Invidious on each release/commit. More information about the public ARM64 runners here: https://github.com/orgs/community/discussions/148648 CI: Use ARM64 compose file for build-docker-arm64	2025-05-15 01:49:17 -04:00