Add streaming to docker image builds

mastodon · May 6, 2023 · fd98e7c · fd98e7c
1 parent 47ba0fe
commit fd98e7c
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 7 deletions.
diff --git a/.github/workflows/build-image.yml b/.github/workflows/build-image.yml
@@ -10,6 +10,7 @@ on:
     paths:
       - .github/workflows/build-image.yml
       - Dockerfile
+      - ./streaming/Dockerfile
 permissions:
   contents: read
   packages: write
@@ -18,6 +19,19 @@ jobs:
   build-image:
     runs-on: ubuntu-latest
 
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - context: ./
+            image: |
+              tootsuite/mastodon
+              ghcr.io/mastodon/mastodon
+          - context: ./streaming
+            image: |
+              tootsuite/mastodon-streaming
+              ghcr.io/mastodon/mastodon-streaming
+
     concurrency:
       group: ${{ github.workflow }}-${{ github.ref }}
       cancel-in-progress: true
@@ -46,9 +60,7 @@ jobs:
       - uses: docker/metadata-action@v4
         id: meta
         with:
-          images: |
-            tootsuite/mastodon
-            ghcr.io/mastodon/mastodon
+          images: ${{ matrix.image }}
           flavor: |
             latest=auto
           tags: |
@@ -65,7 +77,7 @@ jobs:
 
       - uses: docker/build-push-action@v4
         with:
-          context: .
+          context: ${{ matrix.context }}
           build-args: MASTODON_VERSION_SUFFIX=${{ steps.version_vars.outputs.mastodon_version_suffix }}
           platforms: linux/amd64,linux/arm64
           provenance: false

diff --git a/.github/workflows/build-nightly.yml b/.github/workflows/build-nightly.yml
@@ -11,6 +11,15 @@ jobs:
   build-nightly-image:
     runs-on: ubuntu-latest
 
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - context: ./
+            image: ghcr.io/mastodon/mastodon
+          - context: ./streaming/
+            image: ghcr.io/mastodon/mastodon-streaming
+
     concurrency:
       group: ${{ github.workflow }}-${{ github.ref }}
       cancel-in-progress: true
@@ -31,8 +40,7 @@ jobs:
       - uses: docker/metadata-action@v4
         id: meta
         with:
-          images: |
-            ghcr.io/mastodon/mastodon
+          images: ${{ matrix.image }}
           flavor: |
             latest=auto
           tags: |
@@ -48,7 +56,7 @@ jobs:
 
       - uses: docker/build-push-action@v4
         with:
-          context: .
+          context: ${{ matrix.context }}
           build-args: MASTODON_VERSION_SUFFIX=${{ steps.version_vars.outputs.mastodon_version_suffix }}
           platforms: linux/amd64,linux/arm64
           provenance: false