Merge branch 'master' into ab-hide-decoded-row

CHANGELOG.md

@@ -5,6 +5,7 @@
 - [#2456](https://github.com/poanetwork/blockscout/pull/2456) - fetch pending transactions for geth
 
 ### Fixes
+- [#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
 

PULL_REQUEST_TEMPLATE.md

@@ -35,3 +35,4 @@
   - [ ] If I added new functionality, I added tests covering it.
   - [ ] If I fixed a bug, I added a regression test to prevent the bug from silently reappearing again.
   - [ ] I checked whether I should update the docs and did so if necessary
+  - [ ] If I added/changed/removed ENV var, I should update the list of env vars in https://github.com/poanetwork/blockscout/blob/master/docs/env-variables.md to reflect changes in the table here https://poanetwork.github.io/blockscout/#/env-variables?id=blockscout-env-variables

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
 

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,