From 4b00381e1552babbe9b59bdbce266c98899a1780 Mon Sep 17 00:00:00 2001 From: rjl493456442 Date: Wed, 6 Mar 2019 11:03:00 +0800 Subject: [PATCH 1/2] docker: fix dockerFile for secp256k1 building --- docker/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index a29c69baf4..1c172b952b 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,6 +1,6 @@ FROM bitwalker/alpine-elixir-phoenix:1.7.1 -RUN apk --no-cache --update add automake libtool inotify-tools autoconf python +RUN apk --no-cache --update add alpine-sdk gmp-dev automake libtool inotify-tools autoconf python EXPOSE 4000 @@ -33,7 +33,7 @@ RUN cd apps/block_scout_web/assets/ && \ RUN cd apps/explorer/ && \ npm install && \ - cd - + apk del --force-broken-world alpine-sdk gmp-dev automake libtool inotify-tools autoconf python # RUN mix do ecto.drop --force, ecto.create, ecto.migrate From 0ed2ad01504ed3b92015ab20b2e8ff36e434ce16 Mon Sep 17 00:00:00 2001 From: Victor Baranov Date: Mon, 22 Apr 2019 14:22:29 +0300 Subject: [PATCH 2/2] Update Docker readme Typos fixes --- docker/README.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/docker/README.md b/docker/README.md index f45a340f39..ba3458883d 100644 --- a/docker/README.md +++ b/docker/README.md @@ -3,14 +3,14 @@ For now this integration is not production ready. It made only for local usage only ! ## How to use ? -First of all blockscout requires `PostgreSQL` server for working. +First of all, blockscout requires `PostgreSQL` server for working. It will be provided by starting script (new docker image will be created named `postgres`) **Starting command** `make start` - will set everything up and start blockscout in container. To connect it to your local environment you will have to configure it using [env variables](#env-variables) -Exmaple connecting to local `ganache` instance running on port `2000` on Mac/Windows: +Example connecting to local `ganache` instance running on port `2000` on Mac/Windows: ```bash COIN=DAI \ ETHEREUM_JSONRPC_VARIANT=ganache \ @@ -27,15 +27,15 @@ On Linux docker is starting using `--network=host` and all services should be av ### Migrations -By default `Makefile` will do migrations for you on `PostgreSQL` creation. -But you could run migrations manualy using `make migrate` command. +By default, `Makefile` will do migrations for you on `PostgreSQL` creation. +But you could run migrations manually using `make migrate` command. **WARNING** Migrations will clean up your local database ! ## Env variables -BlockScout support 3 different JSON RPC Variants. -Vriant could be configured using `ETHEREUM_JSONRPC_VARIANT` environment variable. +BlockScout supports 3 different JSON RPC Variants. +Variant could be configured using `ETHEREUM_JSONRPC_VARIANT` environment variable. Example: ```bash