fix: update default builder version

fixes #237 also updated OTP, Elixir and builder version in workflows
emqx · Nov 29, 2023 · c9ad084 · c9ad084
1 parent d25cd0f
commit c9ad084
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 12 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -11,7 +11,7 @@ jobs:
         otp:
           - 25.3.2-2
         elixir:
-          - 1.14.5
+          - 1.15.7
     steps:
       - uses: actions/checkout@v3
         with:
@@ -39,7 +39,7 @@ jobs:
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
           build-args: |
-            FROM=ghcr.io/emqx/emqx-builder/5.2-3:${{ matrix.elixir }}-${{ matrix.otp }}-debian11
+            FROM=ghcr.io/emqx/emqx-builder/5.2-7:${{ matrix.elixir }}-${{ matrix.otp }}-debian11
 
   linux:
     runs-on: ubuntu-latest
@@ -49,15 +49,15 @@ jobs:
         otp:
           - 25.3.2-2
         elixir:
-          - 1.14.5
+          - 1.15.7
         quic_support:
           - true
           - false
         os:
           - ubuntu22.04
 
     container:
-      image: ghcr.io/emqx/emqx-builder/5.2-3:${{ matrix.elixir }}-${{ matrix.otp }}-${{ matrix.os }}
+      image: ghcr.io/emqx/emqx-builder/5.2-7:${{ matrix.elixir }}-${{ matrix.otp }}-${{ matrix.os }}
 
     steps:
       - uses: actions/checkout@v3
@@ -90,6 +90,7 @@ jobs:
         macos:
           - macos-12-arm64
           - macos-12
+          - macos-13
         otp:
           - 25.3.2-2
 

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -20,9 +20,9 @@ jobs:
       fail-fast: false
       matrix:
         otp:
-          - 25.3.2-1
+          - 25.3.2-2
         elixir:
-          - 1.14.5
+          - 1.15.7
     steps:
       - uses: actions/checkout@v3
         with:
@@ -52,17 +52,17 @@ jobs:
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
           build-args: |
-            FROM=ghcr.io/emqx/emqx-builder/5.1-3:${{ matrix.elixir }}-${{ matrix.otp }}-debian11
+            FROM=ghcr.io/emqx/emqx-builder/5.2-7:${{ matrix.elixir }}-${{ matrix.otp }}-debian11
 
   linux:
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
         otp:
-          - 25.3.2-1
+          - 25.3.2-2
         elixir:
-          - 1.14.5
+          - 1.15.7
         quic_support:
           - true
           - false
@@ -81,7 +81,7 @@ jobs:
           - amzn2
           - amzn2023
     container:
-      image: ghcr.io/emqx/emqx-builder/5.1-3:${{ matrix.elixir }}-${{ matrix.otp }}-${{ matrix.os }}
+      image: ghcr.io/emqx/emqx-builder/5.2-7:${{ matrix.elixir }}-${{ matrix.otp }}-${{ matrix.os }}
 
     steps:
       - uses: actions/checkout@v3
@@ -115,8 +115,9 @@ jobs:
         macos:
           - macos-12-arm64
           - macos-12
+          - macos-13
         otp:
-          - 25.3.2-1
+          - 25.3.2-2
 
     runs-on: ${{ matrix.macos }}
 

diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-ARG FROM=ghcr.io/emqx/emqx-builder/5.0-31:1.13.4-24.3.4.2-2-debian11
+ARG FROM=ghcr.io/emqx/emqx-builder/5.2-7:1.15.7-25.3.2-2-debian11
 FROM ${FROM}
 COPY . /emqtt_bench
 WORKDIR /emqtt_bench