From ee305f2dd05d8e4ea3833e2a6e34acd9626c4f5d Mon Sep 17 00:00:00 2001
From: Ivan Dyachkov <dev@dyachkov.org>
Date: Wed, 31 Jan 2024 16:54:50 +0100
Subject: [PATCH] ci: use OTP 25.3.2-2 for building docker

due to segfault on 26 https://github.com/erlang/otp/issues/8051
---
 .github/workflows/_push-entrypoint.yaml             | 3 ++-
 .github/workflows/build_and_push_docker_images.yaml | 8 ++++----
 build                                               | 2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/_push-entrypoint.yaml b/.github/workflows/_push-entrypoint.yaml
index a6d0e178e..486335534 100644
--- a/.github/workflows/_push-entrypoint.yaml
+++ b/.github/workflows/_push-entrypoint.yaml
@@ -107,7 +107,8 @@ jobs:
       version: ${{ needs.prepare.outputs.version }}
       publish: ${{ needs.prepare.outputs.release }}
       latest: ${{ needs.prepare.outputs.latest }}
-      otp_vsn: ${{ needs.prepare.outputs.otp_vsn }}
+      # TODO: revert this back to needs.prepare.outputs.otp_vsn when OTP 26 bug is fixed
+      otp_vsn: 25.3.2
       elixir_vsn: ${{ needs.prepare.outputs.elixir_vsn }}
       builder_vsn: ${{ needs.prepare.outputs.builder_vsn }}
     secrets: inherit
diff --git a/.github/workflows/build_and_push_docker_images.yaml b/.github/workflows/build_and_push_docker_images.yaml
index 49416db92..1ab553840 100644
--- a/.github/workflows/build_and_push_docker_images.yaml
+++ b/.github/workflows/build_and_push_docker_images.yaml
@@ -58,7 +58,7 @@ on:
       otp_vsn:
         required: false
         type: string
-        default: '26.2.1-2'
+        default: '25.3.2-2'
       elixir_vsn:
         required: false
         type: string
@@ -127,8 +127,8 @@ jobs:
         EMQX_RUNNER: 'debian:11-slim'
         EMQX_DOCKERFILE: 'deploy/docker/Dockerfile'
         PKG_VSN: ${{ inputs.version }}
-        EMQX_BUILDER_VSN: ${{ inputs.builder_vsn }}
-        EMQX_OTP_VSN: ${{ inputs.otp_vsn }}
-        EMQX_ELIXIR_VSN: ${{ inputs.elixir_vsn }}
+        EMQX_BUILDER_VERSION: ${{ inputs.builder_vsn }}
+        EMQX_BUILDER_OTP: ${{ inputs.otp_vsn }}
+        EMQX_BUILDER_ELIXIR: ${{ inputs.elixir_vsn }}
       run: |
         ./build ${PROFILE} docker
diff --git a/build b/build
index eca2d734b..4a5e01f7e 100755
--- a/build
+++ b/build
@@ -389,7 +389,7 @@ docker_cleanup() {
 make_docker() {
     local EMQX_BUILDER_VERSION="${EMQX_BUILDER_VERSION:-5.3-2}"
     local EMQX_BUILDER_PLATFORM="${EMQX_BUILDER_PLATFORM:-debian11}"
-    local EMQX_BUILDER_OTP="${EMQX_BUILDER_OTP:-26.2.1-2}"
+    local EMQX_BUILDER_OTP="${EMQX_BUILDER_OTP:-25.3.2-2}"
     local EMQX_BUILDER_ELIXIR="${EMQX_BUILDER_ELIXIR:-1.15.7}"
     local EMQX_BUILDER=${EMQX_BUILDER:-ghcr.io/emqx/emqx-builder/${EMQX_BUILDER_VERSION}:${EMQX_BUILDER_ELIXIR}-${EMQX_BUILDER_OTP}-${EMQX_BUILDER_PLATFORM}}
     local EMQX_RUNNER="${EMQX_RUNNER:-${EMQX_DEFAULT_RUNNER}}"