Merge branch 'master' into ab-increase-rewards-timeout

5 years ago · 6a192153c1
parent 90551b0d0f ebbecf38ee
commit 6a192153c1
3 changed files with 3 additions and 2 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -6,6 +6,7 @@
 ### Fixes
 - [#2502](https://github.com/poanetwork/blockscout/pull/2502) - increase reward task timeout
 - [#2496](https://github.com/poanetwork/blockscout/pull/2496) - fix docker build
 - [#2459](https://github.com/poanetwork/blockscout/pull/2459) - fix top addresses query
 - [#2425](https://github.com/poanetwork/blockscout/pull/2425) - Force to show address view for checksummed address even if it is not in DB
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@ -1,4 +1,4 @@
-FROM bitwalker/alpine-elixir-phoenix:1.9.1
+FROM bitwalker/alpine-elixir-phoenix:1.9.0
 RUN apk --no-cache --update add alpine-sdk gmp-dev automake libtool inotify-tools autoconf python
--- a/mix.exs
+++ b/mix.exs
@ -14,7 +14,7 @@ defmodule BlockScout.Mixfile do
        plt_add_apps: ~w(ex_unit mix)a,
        ignore_warnings: ".dialyzer-ignore"
      ],
-      elixir: "~> 1.9.1",
+      elixir: "~> 1.9",
      preferred_cli_env: [
        coveralls: :test,
        "coveralls.detail": :test,
`@ -1,4 +1,4 @@`
	`FROM bitwalker/alpine-elixir-phoenix:1.9.1`	`FROM bitwalker/alpine-elixir-phoenix:1.9.0`

	`RUN apk --no-cache --update add alpine-sdk gmp-dev automake libtool inotify-tools autoconf python`	`RUN apk --no-cache --update add alpine-sdk gmp-dev automake libtool inotify-tools autoconf python`