Fix Makefile docker setup

pull/7210/head
Viktor Baranov 2 years ago
parent ce3d760b1a
commit 762fc76309
  1. 1
      CHANGELOG.md
  2. 6
      docker/Makefile

@ -6,6 +6,7 @@
### Fixes
- [#7210](https://github.com/blockscout/blockscout/pull/7210) - Fix Makefile docker image build
- [#7186](https://github.com/blockscout/blockscout/pull/7186) - Fix build from Dockerfile
### Chore

@ -7,7 +7,9 @@ BS_CONTAINER_NAME := blockscout
PG_CONTAINER_IMAGE := postgres:14
PG_CONTAINER_NAME := db
THIS_FILE = $(lastword $(MAKEFILE_LIST))
TAG := $(RELEASE_VERSION)-prerelease-$(shell git log -1 --pretty=format:"%h")
RELEASE_VERSION ?= '5.1.2'
PORT ?= '4000'
TAG := $(RELEASE_VERSION)-commit-$(shell git log -1 --pretty=format:"%h")
STABLE_TAG := $(RELEASE_VERSION)
ifeq ($(SYSTEM), Linux)
@ -636,7 +638,7 @@ ifdef HAS_BLOCKSCOUT_IMAGE
@echo "==> Image exist. Using $(BS_CONTAINER_IMAGE)"
else
@echo "==> No image found, trying to build one..."
@docker build -f ./Dockerfile -t $(BS_CONTAINER_IMAGE) ../
@docker build -f ./Dockerfile --build-arg RELEASE_VERSION=$(RELEASE_VERSION) -t $(BS_CONTAINER_IMAGE) ../
endif
migrate_only:

Loading…
Cancel
Save