mirror of
https://github.com/valitydev/dominant.git
synced 2024-11-06 02:25:17 +00:00
ED-242: Update erlang and deps (#165)
This commit is contained in:
Sergey Yelin
GitHub
parent
c25af1f5a6
commit
8fdd16bf12
5
Makefile
5
Makefile
@ -14,11 +14,11 @@ SERVICE_IMAGE_PUSH_TAG ?= $(SERVICE_IMAGE_TAG)
|
||||
|
||||
# Base image for the service
|
||||
BASE_IMAGE_NAME := service-erlang
|
||||
BASE_IMAGE_TAG := e95691e5793a8cc497d37fd16c8869215846d926
|
||||
BASE_IMAGE_TAG := ef20e2ec1cb1528e9214bdeb862b15478950d5cd
|
||||
|
||||
# Build image tag to be used
|
||||
BUILD_IMAGE_NAME := build-erlang
|
||||
BUILD_IMAGE_TAG := 4e43ee45b2d476686130b136dce2572a366d3f6a
|
||||
BUILD_IMAGE_TAG := aaa79c2d6b597f93f5f8b724eecfc31ec2e2a23b
|
||||
|
||||
CALL_ANYWHERE := all submodules compile xref lint dialyze release clean distclean check_format format
|
||||
|
||||
@ -63,7 +63,6 @@ clean:
|
||||
$(REBAR) clean
|
||||
|
||||
distclean:
|
||||
$(REBAR) clean -a
|
||||
rm -rf _build
|
||||
|
||||
# CALL_W_CONTAINER
|
||||
|
||||
36
rebar.config
36
rebar.config
@ -28,13 +28,13 @@
|
||||
{deps, [
|
||||
{prometheus, "4.6.0"},
|
||||
{prometheus_cowboy, "0.1.8"},
|
||||
{genlib , {git, "https://github.com/rbkmoney/genlib.git", {branch, "master"}}},
|
||||
{woody , {git, "https://github.com/rbkmoney/woody_erlang.git", {branch, "master"}}},
|
||||
{damsel , {git, "git@github.com:rbkmoney/damsel.git", {branch, "release/erlang/master"}}},
|
||||
{mg_proto , {git, "https://github.com/rbkmoney/machinegun_proto.git", {branch, "master"}}},
|
||||
{dmt_core , {git, "git@github.com:rbkmoney/dmt_core.git", {branch, "master"}}},
|
||||
{scoper , {git, "https://github.com/rbkmoney/scoper.git", {branch, "master"}}},
|
||||
{erl_health , {git, "https://github.com/rbkmoney/erlang-health.git", {branch, master}}},
|
||||
{genlib, {git, "https://github.com/rbkmoney/genlib.git", {branch, "master"}}},
|
||||
{woody, {git, "https://github.com/rbkmoney/woody_erlang.git", {branch, "master"}}},
|
||||
{damsel, {git, "https://github.com/rbkmoney/damsel.git", {branch, "release/erlang/master"}}},
|
||||
{mg_proto, {git, "https://github.com/rbkmoney/machinegun_proto.git", {branch, "master"}}},
|
||||
{dmt_core, {git, "https://github.com/rbkmoney/dmt_core.git", {branch, "master"}}},
|
||||
{scoper, {git, "https://github.com/rbkmoney/scoper.git", {branch, "master"}}},
|
||||
{erl_health, {git, "https://github.com/rbkmoney/erlang-health.git", {branch, master}}},
|
||||
{how_are_you, {git, "https://github.com/rbkmoney/how_are_you.git", {branch, "master"}}},
|
||||
|
||||
% TODO move to the test profile as soon as compose quirks get fixed
|
||||
@ -68,21 +68,24 @@
|
||||
]}.
|
||||
|
||||
{profiles, [
|
||||
|
||||
{prod, [
|
||||
{deps, [
|
||||
{logger_logstash_formatter,
|
||||
{git, "https://github.com/rbkmoney/logger_logstash_formatter.git", {ref, "87e52c755"}}},
|
||||
% for introspection on production
|
||||
{recon , "2.5.1"},
|
||||
{observer_cli , "1.5.4"}
|
||||
{recon, "2.5.2"},
|
||||
{observer_cli, "1.5.4"}
|
||||
]},
|
||||
{relx, [
|
||||
{release, {dominant, "0.1"}, [
|
||||
{recon , load }, % tools for introspection
|
||||
{observer_cli , load }, % remote introspection
|
||||
{runtime_tools, load }, % debugger
|
||||
{tools , load }, % profiler
|
||||
% tools for introspection
|
||||
{recon, load},
|
||||
% remote introspection
|
||||
{observer_cli, load},
|
||||
% debugger
|
||||
{runtime_tools, load},
|
||||
% profiler
|
||||
{tools, load},
|
||||
sasl,
|
||||
logger_logstash_formatter,
|
||||
dmt_api
|
||||
@ -93,14 +96,13 @@
|
||||
{extended_start_script, true}
|
||||
]}
|
||||
]}
|
||||
|
||||
]}.
|
||||
|
||||
{plugins, [
|
||||
{erlfmt, "0.14.1"}
|
||||
{erlfmt, "1.0.0"}
|
||||
]}.
|
||||
|
||||
{erlfmt, [
|
||||
{print_width, 120},
|
||||
{files, "{src,include,test}/*.{hrl,erl}"}
|
||||
{files, ["{src,include,test}/*.{hrl,erl,app.src}", "rebar.config"]}
|
||||
]}.
|
||||
|
||||
22
rebar.lock
22
rebar.lock
@ -1,6 +1,6 @@
|
||||
{"1.2.0",
|
||||
[{<<"accept">>,{pkg,<<"accept">>,<<"0.3.5">>},2},
|
||||
{<<"bear">>,{pkg,<<"bear">>,<<"0.8.7">>},2},
|
||||
{<<"bear">>,{pkg,<<"bear">>,<<"0.9.0">>},2},
|
||||
{<<"cache">>,{pkg,<<"cache">>,<<"2.3.3">>},1},
|
||||
{<<"certifi">>,{pkg,<<"certifi">>,<<"2.6.1">>},2},
|
||||
{<<"cg_mon">>,
|
||||
@ -10,15 +10,15 @@
|
||||
{<<"cowboy">>,{pkg,<<"cowboy">>,<<"2.9.0">>},1},
|
||||
{<<"cowlib">>,{pkg,<<"cowlib">>,<<"2.11.0">>},2},
|
||||
{<<"damsel">>,
|
||||
{git,"git@github.com:rbkmoney/damsel.git",
|
||||
{git,"https://github.com/rbkmoney/damsel.git",
|
||||
{ref,"6995b15c9969e775b851a45e49b8237e92b8a43a"}},
|
||||
0},
|
||||
{<<"dmt_client">>,
|
||||
{git,"git@github.com:rbkmoney/dmt_client.git",
|
||||
{git,"https://github.com/rbkmoney/dmt_client.git",
|
||||
{ref,"3f66402843ffeb488010f707a193858cb09325e0"}},
|
||||
0},
|
||||
{<<"dmt_core">>,
|
||||
{git,"git@github.com:rbkmoney/dmt_core.git",
|
||||
{git,"https://github.com/rbkmoney/dmt_core.git",
|
||||
{ref,"910e20edbe03ae4645aa3923baea8054003753b5"}},
|
||||
0},
|
||||
{<<"erl_health">>,
|
||||
@ -27,17 +27,17 @@
|
||||
0},
|
||||
{<<"folsom">>,
|
||||
{git,"https://github.com/folsom-project/folsom.git",
|
||||
{ref,"eeb1cc467eb64bd94075b95b8963e80d8b4df3df"}},
|
||||
{ref,"62fd0714e6f0b4e7833880afe371a9c882ea0fc2"}},
|
||||
1},
|
||||
{<<"genlib">>,
|
||||
{git,"https://github.com/rbkmoney/genlib.git",
|
||||
{ref,"3e1776536802739d8819351b15d54ec70568aba7"}},
|
||||
{ref,"2bbc54d4abe0f779d57c8f5911dce64d295b1cd1"}},
|
||||
0},
|
||||
{<<"gproc">>,{pkg,<<"gproc">>,<<"0.9.0">>},1},
|
||||
{<<"hackney">>,{pkg,<<"hackney">>,<<"1.17.4">>},1},
|
||||
{<<"how_are_you">>,
|
||||
{git,"https://github.com/rbkmoney/how_are_you.git",
|
||||
{ref,"29f9d3d7c35f7a2d586c8571f572838df5ec91dd"}},
|
||||
{ref,"2fd8013420328464c2c84302af2781b86577b39f"}},
|
||||
0},
|
||||
{<<"idna">>,{pkg,<<"idna">>,<<"6.1.1">>},2},
|
||||
{<<"jsx">>,{pkg,<<"jsx">>,<<"3.1.0">>},1},
|
||||
@ -54,7 +54,7 @@
|
||||
{<<"ranch">>,{pkg,<<"ranch">>,<<"1.8.0">>},2},
|
||||
{<<"scoper">>,
|
||||
{git,"https://github.com/rbkmoney/scoper.git",
|
||||
{ref,"89a973bf3cedc5a48c9fd89d719d25e79fe10027"}},
|
||||
{ref,"7f3183df279bc8181efe58dafd9cae164f495e6f"}},
|
||||
0},
|
||||
{<<"snowflake">>,
|
||||
{git,"https://github.com/rbkmoney/snowflake.git",
|
||||
@ -68,12 +68,12 @@
|
||||
{<<"unicode_util_compat">>,{pkg,<<"unicode_util_compat">>,<<"0.7.0">>},2},
|
||||
{<<"woody">>,
|
||||
{git,"https://github.com/rbkmoney/woody_erlang.git",
|
||||
{ref,"d9fca6da55a46e39bdb7ad2c0dba0b7205a7e70b"}},
|
||||
{ref,"330bdcf71e99c2ea7aed424cd718939cb360ec1c"}},
|
||||
0}]}.
|
||||
[
|
||||
{pkg_hash,[
|
||||
{<<"accept">>, <<"B33B127ABCA7CC948BBE6CAA4C263369ABF1347CFA9D8E699C6D214660F10CD1">>},
|
||||
{<<"bear">>, <<"16264309AE5D005D03718A5C82641FCC259C9E8F09ADEB6FD79CA4271168656F">>},
|
||||
{<<"bear">>, <<"A31CCF5361791DD5E708F4789D67E2FEF496C4F05935FC59ADC11622F834D128">>},
|
||||
{<<"cache">>, <<"B23A5FE7095445A88412A6E614C933377E0137B44FFED77C9B3FEF1A731A20B2">>},
|
||||
{<<"certifi">>, <<"DBAB8E5E155A0763EEA978C913CA280A6B544BFA115633FA20249C3D396D9493">>},
|
||||
{<<"cowboy">>, <<"865DD8B6607E14CF03282E10E934023A1BD8BE6F6BACF921A7E2A96D800CD452">>},
|
||||
@ -93,7 +93,7 @@
|
||||
{<<"unicode_util_compat">>, <<"BC84380C9AB48177092F43AC89E4DFA2C6D62B40B8BD132B1059ECC7232F9A78">>}]},
|
||||
{pkg_hash_ext,[
|
||||
{<<"accept">>, <<"11B18C220BCC2EAB63B5470C038EF10EB6783BCB1FCDB11AA4137DEFA5AC1BB8">>},
|
||||
{<<"bear">>, <<"534217DCE6A719D59E54FB0EB7A367900DBFC5F85757E8C1F94269DF383F6D9B">>},
|
||||
{<<"bear">>, <<"47F71F098F2E3CD05E124A896C5EC2F155967A2B6FF6731E0D627312CCAB7E28">>},
|
||||
{<<"cache">>, <<"44516CE6FA03594D3A2AF025DD3A87BFE711000EB730219E1DDEFC816E0AA2F4">>},
|
||||
{<<"certifi">>, <<"524C97B4991B3849DD5C17A631223896272C6B0AF446778BA4675A1DFF53BB7E">>},
|
||||
{<<"cowboy">>, <<"2C729F934B4E1AA149AFF882F57C6372C15399A20D54F65C8D67BEF583021BDE">>},
|
||||
|
||||
Loading…
Reference in New Issue
Block a user