CipherLabs
/
blockscout
mirror of https://github.com/blockscout/blockscout
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2000 from mkrufky/container-name

Browse Source 
docker/Makefile: always set a container name
pull/1966/head
Victor Baranov 6 years ago committed by GitHub
parent 042eb3ae20 c982f86458
commit 970967ff1d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 1 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 1
      CHANGELOG.md
  2. 3
      docker/Makefile

1
CHANGELOG.md
Unescape View File

@ -1,4 +1,5 @@
## Current ## Current
- [#2000](https://github.com/poanetwork/blockscout/pull/2000) - docker/Makefile: always set a container name
### Features ### Features
- [#1963](https://github.com/poanetwork/blockscout/pull/1963) - added rinkeby theme and rinkeby logo - [#1963](https://github.com/poanetwork/blockscout/pull/1963) - added rinkeby theme and rinkeby logo

3
docker/Makefile
Unescape View File

@ -1,6 +1,7 @@
SYSTEM = $(shell uname -s) SYSTEM = $(shell uname -s)
HOST = host.docker.internal HOST = host.docker.internal
DOCKER_IMAGE = blockscout_prod DOCKER_IMAGE = blockscout_prod
BS_CONTAINER_NAME = blockscout
PG_CONTAINER_NAME = postgres PG_CONTAINER_NAME = postgres
PG_CONTAINER_IMAGE = postgres:10.4 PG_CONTAINER_IMAGE = postgres:10.4
THIS_FILE = $(lastword $(MAKEFILE_LIST)) THIS_FILE = $(lastword $(MAKEFILE_LIST))
@ -87,7 +88,7 @@ endif
start: build postgres start: build postgres
@echo "==> Starting blockscout" @echo "==> Starting blockscout"
@docker run --rm \ @docker run --rm --name $(BS_CONTAINER_NAME) \
$(BLOCKSCOUT_CONTAINNER_PARAMS) \ $(BLOCKSCOUT_CONTAINNER_PARAMS) \
-p 4000:4000 \ -p 4000:4000 \
$(DOCKER_IMAGE) /bin/sh -c "mix phx.server" $(DOCKER_IMAGE) /bin/sh -c "mix phx.server"

Write Preview
Loading…
Cancel
Save