diff --git a/Dockerfile b/Dockerfile index c579ffb31..a5f2595ed 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM bitwalker/alpine-elixir:1.12.3 AS builder +FROM bitwalker/alpine-elixir:1.14.0 AS builder # The following are build arguments used to change variable parts of the image. # The name of your application/release (required) diff --git a/apps/api/mix.exs b/apps/api/mix.exs index d179fbb61..372b6c307 100644 --- a/apps/api/mix.exs +++ b/apps/api/mix.exs @@ -76,7 +76,7 @@ defmodule Api.MixProject do {:plug_cowboy, "~> 2.6.0", override: true}, {:reverse_proxy_plug, "~> 2.1.1"}, {:libcluster, "~> 3.3.1"}, - {:prometheus_ex, "~> 3.0"}, + {:prometheus_ex, git: "https://github.com/lanodan/prometheus.ex", branch: "fix/elixir-1.14", override: true}, {:prometheus_plugs, "~> 1.1.1"}, {:remote_ip, "~> 0.2.0"}, {:k8s_traffic_plug, github: "Financial-Times/k8s_traffic_plug"}, diff --git a/apps/core/mix.exs b/apps/core/mix.exs index 80ed1372d..7da3a7778 100644 --- a/apps/core/mix.exs +++ b/apps/core/mix.exs @@ -106,7 +106,7 @@ defmodule Core.MixProject do {:websockex, "~> 0.4"}, {:hackney, "~> 1.18.0", override: true}, {:tzdata, "~> 1.1.0", override: true}, - {:prometheus_ex, "~> 3.0"}, + {:prometheus_ex, git: "https://github.com/lanodan/prometheus.ex", branch: "fix/elixir-1.14", override: true}, {:stripity_stripe, "~> 2.17.1"}, {:conduit, "~> 0.12"}, {:conduit_amqp, "~> 0.6.3"}, diff --git a/apps/rtc/mix.exs b/apps/rtc/mix.exs index c47fd4a0c..d35c8dba3 100644 --- a/apps/rtc/mix.exs +++ b/apps/rtc/mix.exs @@ -78,7 +78,7 @@ defmodule Rtc.MixProject do {:plug_cowboy, "~> 2.6.0", override: true}, {:absinthe_phoenix, "~> 2.0.2"}, {:libcluster, "~> 3.3.1"}, - {:prometheus_ex, "~> 3.0"}, + {:prometheus_ex, git: "https://github.com/lanodan/prometheus.ex", branch: "fix/elixir-1.14", override: true}, {:prometheus_plugs, "~> 1.1.1"}, {:websockex, "~> 0.4"}, {:k8s_traffic_plug, github: "Financial-Times/k8s_traffic_plug"}, diff --git a/mix.lock b/mix.lock index 91aba3e35..ed7cc5d8f 100644 --- a/mix.lock +++ b/mix.lock @@ -120,10 +120,11 @@ "poolboy": {:hex, :poolboy, "1.5.2", "392b007a1693a64540cead79830443abf5762f5d30cf50bc95cb2c1aaafa006b", [:rebar3], [], "hexpm", "dad79704ce5440f3d5a3681c8590b9dc25d1a561e8f5a9c995281012860901e3"}, "porcelain": {:hex, :porcelain, "2.0.3", "2d77b17d1f21fed875b8c5ecba72a01533db2013bd2e5e62c6d286c029150fdc", [:mix], [], "hexpm", "dc996ab8fadbc09912c787c7ab8673065e50ea1a6245177b0c24569013d23620"}, "postgrex": {:hex, :postgrex, "0.16.5", "fcc4035cc90e23933c5d69a9cd686e329469446ef7abba2cf70f08e2c4b69810", [:mix], [{:connection, "~> 1.1", [hex: :connection, repo: "hexpm", optional: false]}, {:db_connection, "~> 2.1", [hex: :db_connection, repo: "hexpm", optional: false]}, {:decimal, "~> 1.5 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:table, "~> 0.1.0", [hex: :table, repo: "hexpm", optional: true]}], "hexpm", "edead639dc6e882618c01d8fc891214c481ab9a3788dfe38dd5e37fd1d5fb2e8"}, - "prometheus": {:hex, :prometheus, "4.6.0", "20510f381db1ccab818b4cf2fac5fa6ab5cc91bc364a154399901c001465f46f", [:mix, :rebar3], [], "hexpm", "4905fd2992f8038eccd7aa0cd22f40637ed618c0bed1f75c05aacec15b7545de"}, - "prometheus_ex": {:hex, :prometheus_ex, "3.0.5", "fa58cfd983487fc5ead331e9a3e0aa622c67232b3ec71710ced122c4c453a02f", [:mix], [{:prometheus, "~> 4.0", [hex: :prometheus, repo: "hexpm", optional: false]}], "hexpm", "9fd13404a48437e044b288b41f76e64acd9735fb8b0e3809f494811dfa66d0fb"}, + "prometheus": {:hex, :prometheus, "4.9.1", "ecf9ccf0fdd0fefb13b19f5216aff8b4bdc852171f5c79133bd998ce8210cf65", [:mix, :rebar3], [{:quantile_estimator, "~> 0.2.1", [hex: :quantile_estimator, repo: "hexpm", optional: false]}], "hexpm", "d75e80d7b2c1be6bf296e211e806e939ae3d9e0428f45b4caad1817f028213d3"}, + "prometheus_ex": {:git, "https://github.com/lanodan/prometheus.ex", "31f7fbe4b71b79ba27efc2a5085746c4011ceb8f", [branch: "fix/elixir-1.14"]}, "prometheus_plugs": {:hex, :prometheus_plugs, "1.1.5", "25933d48f8af3a5941dd7b621c889749894d8a1082a6ff7c67cc99dec26377c5", [:mix], [{:accept, "~> 0.1", [hex: :accept, repo: "hexpm", optional: false]}, {:plug, "~> 1.0", [hex: :plug, repo: "hexpm", optional: false]}, {:prometheus_ex, "~> 1.1 or ~> 2.0 or ~> 3.0", [hex: :prometheus_ex, repo: "hexpm", optional: false]}, {:prometheus_process_collector, "~> 1.1", [hex: :prometheus_process_collector, repo: "hexpm", optional: true]}], "hexpm", "0273a6483ccb936d79ca19b0ab629aef0dba958697c94782bb728b920dfc6a79"}, "protobuf": {:hex, :protobuf, "0.5.4", "2e1b8eec211aff034ad8a14e3674220b0158bfb9a3c7128ac9d2a1ed1b3724d3", [:mix], [], "hexpm", "994348a4592408bc99c132603b0fdb686a2b5df0321a8eb1a582ec2bd3495886"}, + "quantile_estimator": {:hex, :quantile_estimator, "0.2.1", "ef50a361f11b5f26b5f16d0696e46a9e4661756492c981f7b2229ef42ff1cd15", [:rebar3], [], "hexpm", "282a8a323ca2a845c9e6f787d166348f776c1d4a41ede63046d72d422e3da946"}, "quantum": {:hex, :quantum, "2.3.4", "72a0e8855e2adc101459eac8454787cb74ab4169de6ca50f670e72142d4960e9", [:mix], [{:calendar, "~> 0.17", [hex: :calendar, repo: "hexpm", optional: true]}, {:crontab, "~> 1.1", [hex: :crontab, repo: "hexpm", optional: false]}, {:gen_stage, "~> 0.12", [hex: :gen_stage, repo: "hexpm", optional: false]}, {:swarm, "~> 3.3", [hex: :swarm, repo: "hexpm", optional: false]}, {:timex, "~> 3.1", [hex: :timex, repo: "hexpm", optional: true]}], "hexpm"}, "rabbit_common": {:hex, :rabbit_common, "3.11.3", "cf1466d99ba1b0788b046f6481c567cdd02580fdf277ba86e9417b5cc5eb6f1a", [:make, :rebar3], [{:credentials_obfuscation, "3.2.0", [hex: :credentials_obfuscation, repo: "hexpm", optional: false]}, {:recon, "2.5.2", [hex: :recon, repo: "hexpm", optional: false]}, {:thoas, "0.4.0", [hex: :thoas, repo: "hexpm", optional: false]}], "hexpm", "b997df691f8a8ea12b52a3fbc5b5b6ca862879544162e63e7679a3f8d0ce22a4"}, "ranch": {:hex, :ranch, "1.8.0", "8c7a100a139fd57f17327b6413e4167ac559fbc04ca7448e9be9057311597a1d", [:make, :rebar3], [], "hexpm", "49fbcfd3682fab1f5d109351b61257676da1a2fdbe295904176d5e521a2ddfe5"},