From 86ccae6d2c9eff7298443eba256251ab7a40a6bc Mon Sep 17 00:00:00 2001
From: Andreas Schultz <andreas.schultz@travelping.com>
Date: Tue, 18 May 2021 10:02:30 +0200
Subject: [PATCH] update release specs and deps for OTP-24

---
 apps/ergw/src/ergw.app.src |  2 +-
 docker/Dockerfile          |  2 +-
 rebar.config               |  4 ++--
 rebar.lock                 | 20 ++++++++++----------
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/apps/ergw/src/ergw.app.src b/apps/ergw/src/ergw.app.src
index 20631041..dc3d170a 100644
--- a/apps/ergw/src/ergw.app.src
+++ b/apps/ergw/src/ergw.app.src
@@ -4,7 +4,7 @@
     {description, "3GPP GGSN/PGW"},
     {applications, [kernel, stdlib, crypto, gun,
 		    erlando, regine, gtplib, pfcplib, plists,
-		    setup, netdata,
+		    setup, netdata, jesse, fast_yaml,
 		    prometheus, cowboy, prometheus_cowboy,
 		    prometheus_diameter_collector,
 		    jsx, compiler, os_mon, jobs, ra,
diff --git a/docker/Dockerfile b/docker/Dockerfile
index f2d1fc87..5bc5af53 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,7 +1,7 @@
 # -- build-environment --
 # see https://docs.docker.com/engine/userguide/eng-image/multistage-build/
 
-FROM erlang:24.0-rc1.0.0-alpine AS build-env
+FROM quay.io/travelping/alpine-erlang:24.0 AS build-env
 
 WORKDIR /build
 RUN     apk update && apk --no-cache upgrade && \
diff --git a/rebar.config b/rebar.config
index 045a47c8..413df61c 100644
--- a/rebar.config
+++ b/rebar.config
@@ -10,7 +10,7 @@
 	{jsx, "3.0.0"},
 	{fast_yaml, "1.0.31"},
 	{jesse, "1.5.6"},
-	{cowboy, "2.8.0"},
+	{cowboy, "2.9.0"},
 	{prometheus, {git, "https://github.com/deadtrickster/prometheus.erl.git", {branch, "master"}}},
 	{prometheus_cowboy, "0.1.8"},
 	{prometheus_diameter_collector, "1.2.0"},
@@ -77,7 +77,7 @@
 	   ]}.
 
 {relx, [{release, { 'ergw-c-node', semver },
-	 [ergw_core,
+	 [ergw, ergw_core,
 	  sasl,
 	  runtime_tools,
 	  recon,
diff --git a/rebar.lock b/rebar.lock
index 2c67e270..a1ec12db 100644
--- a/rebar.lock
+++ b/rebar.lock
@@ -1,8 +1,8 @@
 {"1.2.0",
 [{<<"accept">>,{pkg,<<"accept">>,<<"0.3.5">>},2},
  {<<"aten">>,{pkg,<<"aten">>,<<"0.5.5">>},1},
- {<<"cowboy">>,{pkg,<<"cowboy">>,<<"2.8.0">>},0},
- {<<"cowlib">>,{pkg,<<"cowlib">>,<<"2.9.1">>},1},
+ {<<"cowboy">>,{pkg,<<"cowboy">>,<<"2.9.0">>},0},
+ {<<"cowlib">>,{pkg,<<"cowlib">>,<<"2.11.0">>},1},
  {<<"cut">>,{pkg,<<"cut">>,<<"1.0.3">>},1},
  {<<"eradius">>,{pkg,<<"eradius">>,<<"2.2.1">>},1},
  {<<"ergw_aaa">>,
@@ -30,7 +30,7 @@
  {<<"p1_utils">>,{pkg,<<"p1_utils">>,<<"1.0.22">>},1},
  {<<"parse_trans">>,
   {git,"https://github.com/uwiger/parse_trans.git",
-       {ref,"4c4990dc8b0842421888794e5d8031f097de239f"}},
+       {ref,"56f5c6cad48eaca8e0b2626e0df3587e6bf2da6e"}},
   0},
  {<<"pfcplib">>,{pkg,<<"pfcplib">>,<<"2.0.0">>},0},
  {<<"plists">>,
@@ -54,7 +54,7 @@
  {<<"prometheus_httpd">>,{pkg,<<"prometheus_httpd">>,<<"2.1.11">>},1},
  {<<"quantile_estimator">>,{pkg,<<"quantile_estimator">>,<<"0.2.1">>},1},
  {<<"ra">>,{pkg,<<"ra">>,<<"1.1.8">>},0},
- {<<"ranch">>,{pkg,<<"ranch">>,<<"1.7.1">>},1},
+ {<<"ranch">>,{pkg,<<"ranch">>,<<"1.8.0">>},1},
  {<<"regine">>,{pkg,<<"regine">>,<<"1.0.0">>},1},
  {<<"rfc3339">>,{pkg,<<"rfc3339">>,<<"0.2.2">>},1},
  {<<"riak_core">>,{pkg,<<"riak_core_lite">>,<<"0.10.0">>},0},
@@ -67,8 +67,8 @@
 {pkg_hash,[
  {<<"accept">>, <<"B33B127ABCA7CC948BBE6CAA4C263369ABF1347CFA9D8E699C6D214660F10CD1">>},
  {<<"aten">>, <<"25F619B171F673BBF35BE7DE2323102FFF731BF832D7F2EADE4DB6E43D48226F">>},
- {<<"cowboy">>, <<"F3DC62E35797ECD9AC1B50DB74611193C29815401E53BAC9A5C0577BD7BC667D">>},
- {<<"cowlib">>, <<"61A6C7C50CF07FDD24B2F45B89500BB93B6686579B069A89F88CB211E1125C78">>},
+ {<<"cowboy">>, <<"865DD8B6607E14CF03282E10E934023A1BD8BE6F6BACF921A7E2A96D800CD452">>},
+ {<<"cowlib">>, <<"0B9FF9C346629256C42EBE1EEB769A83C6CB771A6EE5960BD110AB0B9B872063">>},
  {<<"cut">>, <<"1577F2F3BC0F2BF3B97903B7426F8A3D79523687B6A444D0F59A095EF69A0E81">>},
  {<<"eradius">>, <<"5F8A3857BE20E1759D96B46E7537F6031DC879FD609471546341E892DD115E54">>},
  {<<"fast_yaml">>, <<"A66D0E678341DC20680AECE8E6FD566205A229981B5B3CFA698C66323B728DA2">>},
@@ -86,7 +86,7 @@
  {<<"prometheus_httpd">>, <<"F616ED9B85B536B195D94104063025A91F904A4CFC20255363F49A197D96C896">>},
  {<<"quantile_estimator">>, <<"EF50A361F11B5F26B5F16D0696E46A9E4661756492C981F7B2229EF42FF1CD15">>},
  {<<"ra">>, <<"F5334CA94EAC3DA159B3F79769AC480DBE5CC838807517F38FCA3931DA5B362C">>},
- {<<"ranch">>, <<"6B1FAB51B49196860B733A49C07604465A47BDB78AA10C1C16A3D199F7F8C881">>},
+ {<<"ranch">>, <<"8C7A100A139FD57F17327B6413E4167AC559FBC04CA7448E9BE9057311597A1D">>},
  {<<"regine">>, <<"81CB906BCDA9E177C85FE5D1825B55A5A33F528B46A914278DBAA1403FE13E59">>},
  {<<"rfc3339">>, <<"1552DF616ACA368D982E9F085A0E933B6688A3F4938A671798978EC2C0C58730">>},
  {<<"riak_core">>, <<"52864992CBD2331F7C5E7753374D8F1655A2046B64A6DF3E5184B6D42E936963">>},
@@ -94,8 +94,8 @@
 {pkg_hash_ext,[
  {<<"accept">>, <<"11B18C220BCC2EAB63B5470C038EF10EB6783BCB1FCDB11AA4137DEFA5AC1BB8">>},
  {<<"aten">>, <<"AC1D4143B06EE547EFADA2EAC57EFE744362A35A9AB5D52EF61D054AF8028117">>},
- {<<"cowboy">>, <<"4643E4FBA74AC96D4D152C75803DE6FAD0B3FA5DF354C71AFDD6CBEEB15FAC8A">>},
- {<<"cowlib">>, <<"E4175DC240A70D996156160891E1C62238EDE1729E45740BDD38064DAD476170">>},
+ {<<"cowboy">>, <<"2C729F934B4E1AA149AFF882F57C6372C15399A20D54F65C8D67BEF583021BDE">>},
+ {<<"cowlib">>, <<"2B3E9DA0B21C4565751A6D4901C20D1B4CC25CBB7FD50D91D2AB6DD287BC86A9">>},
  {<<"cut">>, <<"1A4A25DB2B7C5565FD28B314A4EEB898B1ED3CAFFA1AB09149345FB5731ED04B">>},
  {<<"eradius">>, <<"EF3F8F2D33B63D56ACB5B60E1DFFDA53744239AAEAE489459C6172C9CA4166F0">>},
  {<<"fast_yaml">>, <<"8AA129E3384C5AA9F5F1597A1E3321A63A44860F3951F23EEED950BF0EE59643">>},
@@ -113,7 +113,7 @@
  {<<"prometheus_httpd">>, <<"0BBE831452CFDF9588538EB2F570B26F30C348ADAE5E95A7D87F35A5910BCF92">>},
  {<<"quantile_estimator">>, <<"282A8A323CA2A845C9E6F787D166348F776C1D4A41EDE63046D72D422E3DA946">>},
  {<<"ra">>, <<"D7E399F8A09C8420BC90953F3464127063E53CEF39F27E0AF452EC51AD26EA9E">>},
- {<<"ranch">>, <<"451D8527787DF716D99DC36162FCA05934915DB0B6141BBDAC2EA8D3C7AFC7D7">>},
+ {<<"ranch">>, <<"49FBCFD3682FAB1F5D109351B61257676DA1A2FDBE295904176D5E521A2DDFE5">>},
  {<<"regine">>, <<"74A329F769BF5A7DA56C3F04B61AAFFB7276E9AED7D2BF9789F024502CAD0458">>},
  {<<"rfc3339">>, <<"986D7F9BAC6891AA4D5051690058DE4E623245620BBEADA7F239F85C4DF8F23C">>},
  {<<"riak_core">>, <<"712892ECBAAFBA6355452B243E1E9F684CE28585D6D4CC040D1696C98B5B05F7">>},