Merge branch 'master' into ab-get-rid-of-cldr-warnings

.circleci/config.yml

@@ -3,7 +3,7 @@ jobs:
   build:
     docker:
       # Ensure .tool-versions matches
-      - image: circleci/elixir:1.9.0-node-browsers
+      - image: circleci/elixir:1.9.1-node-browsers
         environment:
           MIX_ENV: test
           # match POSTGRES_PASSWORD for postgres image below
@@ -129,7 +129,7 @@ jobs:
   check_formatted:
     docker:
       # Ensure .tool-versions matches
-      - image: circleci/elixir:1.9.0
+      - image: circleci/elixir:1.9.1
         environment:
           MIX_ENV: test
 
@@ -143,7 +143,7 @@ jobs:
   credo:
     docker:
       # Ensure .tool-versions matches
-      - image: circleci/elixir:1.9.0
+      - image: circleci/elixir:1.9.1
         environment:
           MIX_ENV: test
 
@@ -177,7 +177,7 @@ jobs:
   dialyzer:
     docker:
       # Ensure .tool-versions matches
-      - image: circleci/elixir:1.9.0
+      - image: circleci/elixir:1.9.1
         environment:
           MIX_ENV: test
 
@@ -247,7 +247,7 @@ jobs:
   gettext:
     docker:
       # Ensure .tool-versions matches
-      - image: circleci/elixir:1.9.0
+      - image: circleci/elixir:1.9.1
         environment:
           MIX_ENV: test
 
@@ -286,7 +286,7 @@ jobs:
   release:
     docker:
       # Ensure .tool-versions matches
-      - image: circleci/elixir:1.9.0
+      - image: circleci/elixir:1.9.1
         environment:
           MIX_ENV: prod
 
@@ -312,7 +312,7 @@ jobs:
   sobelow:
     docker:
       # Ensure .tool-versions matches
-      - image: circleci/elixir:1.9.0
+      - image: circleci/elixir:1.9.1
         environment:
           MIX_ENV: test
 
@@ -336,7 +336,7 @@ jobs:
   test_geth_http_websocket:
     docker:
       # Ensure .tool-versions matches
-      - image: circleci/elixir:1.9.0-node-browsers
+      - image: circleci/elixir:1.9.1-node-browsers
         environment:
           MIX_ENV: test
           # match POSTGRES_PASSWORD for postgres image below
@@ -390,7 +390,7 @@ jobs:
   test_geth_mox:
     docker:
       # Ensure .tool-versions matches
-      - image: circleci/elixir:1.9.0-node-browsers
+      - image: circleci/elixir:1.9.1-node-browsers
         environment:
           MIX_ENV: test
           # match POSTGRES_PASSWORD for postgres image below
@@ -444,7 +444,7 @@ jobs:
   test_parity_http_websocket:
     docker:
       # Ensure .tool-versions matches
-      - image: circleci/elixir:1.9.0-node-browsers
+      - image: circleci/elixir:1.9.1-node-browsers
         environment:
           MIX_ENV: test
           # match POSTGRES_PASSWORD for postgres image below
@@ -498,7 +498,7 @@ jobs:
   test_parity_mox:
     docker:
       # Ensure .tool-versions matches
-      - image: circleci/elixir:1.9.0-node-browsers
+      - image: circleci/elixir:1.9.1-node-browsers
         environment:
           MIX_ENV: test
           # match POSTGRES_PASSWORD for postgres image below
@@ -552,7 +552,7 @@ jobs:
   coveralls_merge:
     docker:
       # Ensure .tool-versions matches
-      - image: circleci/elixir:1.9.0
+      - image: circleci/elixir:1.9.1
         environment:
           MIX_ENV: test
 

.tool-versions

@@ -1,3 +1,3 @@
-elixir 1.9
-erlang 21.0.4
+elixir 1.9.1-otp-22
+erlang 22.0
 nodejs 10.11.0

CHANGELOG.md

@@ -5,11 +5,13 @@
 - [#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
 
 ### Chore
 - [#2473](https://github.com/poanetwork/blockscout/pull/2473) - get rid of cldr warnings
+- [#2402](https://github.com/poanetwork/blockscout/pull/2402) - bump otp version to 22.0
 - [#2432](https://github.com/poanetwork/blockscout/pull/2432) - bump credo version
 - [#2457](https://github.com/poanetwork/blockscout/pull/2457) - update mix.lock
 - [#2435](https://github.com/poanetwork/blockscout/pull/2435) - Replace deprecated extract-text-webpack-plugin with mini-css-extract-plugin

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