yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

build: update to latest builder image

This commit is contained in:
Zaiming (Stone) Shi 2022-02-23 18:49:08 +01:00
parent fa91c7491f
commit b2cb7f1bd5
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/spelling.yml vendored
View File

@ -17,7 +17,7 @@ jobs:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- uses: actions/download-artifact@v2 - uses: actions/download-artifact@v2
with: with:
name: emqx-24.1.5-4-ubuntu20.04 name: emqx-24.2.1-1-ubuntu20.04
workflow: build_slim_packages.yaml workflow: build_slim_packages.yaml
path: . path: .
- name: Run spellcheck - name: Run spellcheck

2
mix.exs
View File

@ -511,7 +511,7 @@ defmodule EMQXUmbrella.MixProject do
# The `:tar` built-in step in Mix Release does not currently add the # The `:tar` built-in step in Mix Release does not currently add the
# `etc` directory into the resulting tarball. The workaround is to # `etc` directory into the resulting tarball. The workaround is to
# add those to the `:overlays` key before running `:tar`. # add those to the `:overlays` key before running `:tar`.
# See: https://hexdocs.pm/mix/1.13.2/Mix.Release.html#__struct__/0 # See: https://hexdocs.pm/mix/1.13.3/Mix.Release.html#__struct__/0
defp prepare_tar_overlays(release) do defp prepare_tar_overlays(release) do
Map.update!( Map.update!(
release, release,

5
scripts/buildx.sh
View File

@ -8,7 +8,8 @@
## i.e. will not work if docker command has to be executed with sudo ## i.e. will not work if docker command has to be executed with sudo
## example: ## example:
## ./scripts/buildx.sh --profile emqx --pkgtype tgz --arch arm64 --builder ghcr.io/emqx/emqx-builder/4.4-4:24.1.5-3-debian10 ## ./scripts/buildx.sh --profile emqx --pkgtype tgz --arch arm64 \
## --builder ghcr.io/emqx/emqx-builder/5.0-7:1.13.3-24.2.1-1-debian10
set -euo pipefail set -euo pipefail
@ -23,7 +24,7 @@ help() {
echo "--arch amd64|arm64: Target arch to build the EMQX package for" echo "--arch amd64|arm64: Target arch to build the EMQX package for"
echo "--src_dir <SRC_DIR>: EMQX source ode in this dir, default to PWD" echo "--src_dir <SRC_DIR>: EMQX source ode in this dir, default to PWD"
echo "--builder <BUILDER>: Builder image to pull" echo "--builder <BUILDER>: Builder image to pull"
echo " E.g. ghcr.io/emqx/emqx-builder/4.4-4:24.1.5-3-debian10" echo " E.g. ghcr.io/emqx/emqx-builder/5.0-7:1.13.3=24.2.1-1-debian10"
echo "--otp <OTP_VSN>: OTP version being used in the builder" echo "--otp <OTP_VSN>: OTP version being used in the builder"
echo "--elixir <ELIXIR_VSN>: Elixir version being used in the builder" echo "--elixir <ELIXIR_VSN>: Elixir version being used in the builder"
echo "--system <SYSTEM>: OS used in the builder image" echo "--system <SYSTEM>: OS used in the builder image"

2
scripts/update_appup.escript
View File

@ -33,7 +33,7 @@ Options:
--release-dir Release directory --release-dir Release directory
--src-dirs Directories where source code is found. Defaults to '{src,apps,lib-*}/**/' --src-dirs Directories where source code is found. Defaults to '{src,apps,lib-*}/**/'
--binary-rel-url Binary release URL pattern. %VSN% variable is substituted with the version in release tag. --binary-rel-url Binary release URL pattern. %VSN% variable is substituted with the version in release tag.
E.g. \"https://github.com/emqx/emqx/releases/download/v%VSN%/emqx-%VSN%-otp-24.1.5-3-el7-amd64.tar.gz\" E.g. \"https://github.com/emqx/emqx/releases/download/v%VSN%/emqx-%VSN%-otp-24.2.1-1-el7-amd64.tar.gz\"
". ".
-record(app, -record(app,