feat: run the package released by mix

This commit is contained in:
x1001100011 2021-07-21 23:01:07 -07:00
parent 4c1e03bbcd
commit bd3760d5c7
11 changed files with 36 additions and 40 deletions

View File

@ -29,12 +29,12 @@ defmodule EMQX.MixProject do
{:recon, "~> 2.5"},
{:cowboy, github: "emqx/cowboy", tag: "2.8.2"},
{:esockd, github: "emqx/esockd", tag: "5.8.0"},
{:ekka, github: "emqx/ekka", tag: "0.9.0", runtime: false},
{:ekka, github: "emqx/ekka", tag: "0.10.2"},
{:gen_rpc, github: "emqx/gen_rpc", tag: "2.5.1"},
{:cuttlefish, github: "emqx/cuttlefish", tag: "v4.0.1"},
{:hocon, github: "emqx/hocon"},
{:pbkdf2, github: "emqx/erlang-pbkdf2", tag: "2.0.4"},
{:snabbkaffe, github: "kafka4beam/snabbkaffe", tag: "0.13.0"}
{:snabbkaffe, github: "kafka4beam/snabbkaffe", tag: "0.14.0"}
]
end
end

View File

@ -26,6 +26,7 @@ defmodule EMQXAuthentication.MixProject do
defp deps do
[
{:emqx, in_umbrella: true, runtime: false},
{:emqx_http_lib, github: "emqx/emqx_http_lib", tag: "0.2.1"},
{:jose, "~> 1.11"}
]
end

View File

@ -26,6 +26,7 @@ defmodule EMQXCoap.MixProject do
defp deps do
[
{:emqx, in_umbrella: true, runtime: false},
{:emqx_http_lib, github: "emqx/emqx_http_lib", tag: "0.2.1"},
{:gen_coap, github: "emqx/gen_coap", tag: "v0.3.2"}
]
end

View File

@ -9,8 +9,7 @@ defmodule EmqxConfigHelper.Hocon do
options
|> Keyword.fetch!(:schema_module)
|> :hocon_schema.check(config, %{atom_key: true, return_plain: true})
|> IO.inspect
|> :hocon_schema.generate(config, %{atom_key: true, return_plain: true})
|> Enum.each(fn {application, envs} ->
Config.config(application, Enum.to_list(envs))
end)

View File

@ -27,7 +27,8 @@ defmodule EMQXManagement.MixProject do
defp deps do
[
{:emqx_rule_engine, in_umbrella: true},
{:ekka, github: "emqx/ekka", tag: "0.9.0"},
{:ekka, github: "emqx/ekka", tag: "0.10.2"},
{:emqx_http_lib, github: "emqx/emqx_http_lib", tag: "0.2.1"},
{:minirest, github: "emqx/minirest", tag: "0.3.5"}
]
end

View File

@ -27,7 +27,7 @@ defmodule EmqxReleaseHelper.Applications do
end
application :emqx_plugin_libs do
start_type :load
start_type :permanent
end
application :emqx_authz do
@ -41,42 +41,42 @@ defmodule EmqxReleaseHelper.Applications do
end
application :emqx_sn do
start_type :load
start_type :permanent
overlay :plugin
end
application :emqx_authentication do
start_type :load
start_type :permanent
overlay :plugin
end
application :emqx_dashboard do
start_type :load
start_type :permanent
overlay :plugin
end
application :emqx_management do
start_type :load
start_type :permanent
overlay :plugin
end
application :emqx_statsd do
start_type :load
start_type :permanent
overlay :plugin
end
application :emqx_stomp do
start_type :load
start_type :permanent
overlay :plugin
end
application :emqx_bridge_mqtt do
start_type :load
start_type :permanent
overlay :plugin
end
application :emqx_retainer do
start_type :load
start_type :permanent
overlay :plugin
end
@ -86,17 +86,17 @@ defmodule EmqxReleaseHelper.Applications do
end
application :emqx_coap do
start_type :load
start_type :permanent
overlay :plugin
end
application :emqx_rule_engine do
start_type :load
start_type :permanent
overlay :plugin
end
application :emqx_web_hook do
start_type :load
start_type :permanent
overlay :plugin
end
@ -105,22 +105,22 @@ defmodule EmqxReleaseHelper.Applications do
end
application :emqx_exhook, %{release_type: :cloud} do
start_type :load
start_type :permanent
overlay :plugin
end
application :emqx_exproto, %{release_type: :cloud} do
start_type :load
start_type :permanent
overlay :plugin
end
application :emqx_prometheus, %{release_type: :cloud} do
start_type :load
start_type :permanent
overlay :plugin
end
application :emqx_lwm2m, %{release_type: :cloud} do
start_type :load
start_type :permanent
overlay :plugin
overlay do
@ -129,7 +129,7 @@ defmodule EmqxReleaseHelper.Applications do
end
application :emqx_psk_file, %{release_type: :cloud} do
start_type :load
start_type :permanent
overlay :plugin
overlay do

View File

@ -27,7 +27,8 @@ defmodule EMQXRuleEngine.MixProject do
defp deps do
[
{:emqx, in_umbrella: true, runtime: false},
{:ekka, github: "emqx/ekka", tag: "0.9.0"}
{:emqx_http_lib, github: "emqx/emqx_http_lib", tag: "0.2.1"},
{:ekka, github: "emqx/ekka", tag: "0.10.2"}
]
end
end

View File

@ -27,6 +27,7 @@ defmodule EMQXWebHook.MixProject do
defp deps do
[
{:emqx_rule_engine, in_umbrella: true},
{:emqx_http_lib, github: "emqx/emqx_http_lib", tag: "0.2.1"},
{:ehttpc, github: "emqx/ehttpc", tag: "0.1.6"}
]
end

View File

@ -1,13 +0,0 @@
import Config
import EmqxConfigHelper.Hocon
import EmqxConfigHelper.Cuttlefish
hocon :emqx_prometheus,
schema_module: :emqx_prometheus_schema,
config_file: "etc/plugins/emqx_prometheus.conf"
cuttlefish :emqx_sn,
schema_file: "emqx_sn.schema",
config_file: "etc/plugins/emqx_sn.conf"
config :mnesia, dir: '/tmp/mnesia'

View File

@ -4,7 +4,8 @@ defmodule EMQXUmbrella.MixProject do
def project do
[
apps_path: "apps",
version: "5.0.0",
# apps/emqx/include/emqx_release.hrl
version: "5.0-pre",
start_permanent: Mix.env() == :prod,
deps: deps(),
releases: releases()
@ -30,7 +31,9 @@ defmodule EMQXUmbrella.MixProject do
{:eetcd, "~> 0.3", override: true},
{:grpc, github: "emqx/grpc-erl", tag: "0.6.2", override: true},
{:pbkdf2, github: "emqx/erlang-pbkdf2", tag: "2.0.4", override: true},
{:typerefl, github: "k32/typerefl", tag: "0.6.2", manager: :rebar3, override: true}
{:typerefl, github: "k32/typerefl", tag: "0.6.2", manager: :rebar3, override: true},
{:gen_rpc, github: "emqx/gen_rpc", tag: "2.5.1", override: true},
{:snabbkaffe, github: "kafka4beam/snabbkaffe", tag: "0.14.0", override: true}
| (enable_bcrypt() && [{:bcrypt, github: "emqx/erlang-bcrypt", tag: "0.6.0"}]) || []
]
end

View File

@ -7,8 +7,9 @@
"ecpool": {:git, "https://github.com/emqx/ecpool.git", "0516d2cebd14654ef8c583c347e4a0b01363b86d", [tag: "0.5.1"]},
"eetcd": {:hex, :eetcd, "0.3.4", "27e8b4775230c53a9ef602f62a1603591302b40b2eb195d567edffb35b6cf1a2", [:rebar3], [{:gun, "1.3.3", [hex: :gun, repo: "hexpm", optional: false]}], "hexpm", "b763c0e1a9741d39a62f5a19186a342863eacbc769151c4e81db5790efecefca"},
"ehttpc": {:git, "https://github.com/emqx/ehttpc.git", "ac4b513382bab731e91f90e0b70917577f8ddca0", [tag: "0.1.6"]},
"ekka": {:git, "https://github.com/emqx/ekka.git", "103d7d3c49a040010a8b95ba029b882e570edf8c", [tag: "0.9.0"]},
"ekka": {:git, "https://github.com/emqx/ekka.git", "cdde7fa2db89764f5c6be69d8bc6f79f4cfa5c82", [tag: "0.10.2"]},
"emqtt": {:git, "https://github.com/emqx/emqtt.git", "9e867b1fcaadbfcce45ea75d3721f982907ae417", [tag: "v1.2.3"]},
"emqx_http_lib": {:git, "https://github.com/emqx/emqx_http_lib.git", "b8c34801ba5835d96f88d5dd9d8dbdd2c70ffa58", [tag: "0.2.1"]},
"esockd": {:git, "https://github.com/emqx/esockd.git", "9b959fc11a1c398a589892f335235be6c5b4a454", [tag: "5.8.0"]},
"estatsd": {:git, "https://github.com/emqx/estatsd.git", "5184d846b7ecb83509bd4d32695c60428c0198cd", [tag: "0.1.0"]},
"gen_coap": {:git, "https://github.com/emqx/gen_coap.git", "9bf5e7f795badf68e2fb4eb226f576308f5b1bb4", [tag: "v0.3.2"]},
@ -31,7 +32,8 @@
"prometheus": {:git, "https://github.com/emqx/prometheus.erl.git", "a41488df09472448057d264ef520cf2f71d925f8", [tag: "v3.1.1"]},
"ranch": {:git, "https://github.com/ninenines/ranch", "3190aef88aea04d6dce8545fe9b4574288903f44", [tag: "1.7.1"]},
"recon": {:hex, :recon, "2.5.1", "430ffa60685ac1efdfb1fe4c97b8767c92d0d92e6e7c3e8621559ba77598678a", [:mix, :rebar3], [], "hexpm", "5721c6b6d50122d8f68cccac712caa1231f97894bab779eff5ff0f886cb44648"},
"snabbkaffe": {:git, "https://github.com/kafka4beam/snabbkaffe.git", "2f2f6ad09b97e33ba66b195665cef17d04598abd", [tag: "0.13.0"]},
"replayq": {:git, "https://github.com/emqx/replayq", "9e5ba14d65ff1885ad85b6d33a859c01c322f273", [tag: "0.3.1"]},
"snabbkaffe": {:git, "https://github.com/kafka4beam/snabbkaffe.git", "ea1fbffddf8a3b5939bff61cc72ba45c3dceb058", [tag: "0.14.0"]},
"ssl_verify_fun": {:git, "https://github.com/deadtrickster/ssl_verify_fun.erl.git", "c5718226b0b9f3d1a38ef6ca3c3b4c75f53dda92", [tag: "1.1.4"]},
"typerefl": {:git, "https://github.com/k32/typerefl.git", "a1fdd359741a7f58498a6682eb608ff77939b22e", [tag: "0.6.2"]},
}