Skip to content

Commit

Permalink
Enable metrics by default when building docker image (#774)
Browse files Browse the repository at this point in the history
Prometheus metrics are enabled by default when running `make docker-image`.
  • Loading branch information
adambabik authored Mar 27, 2018
1 parent 88f881c commit 8b26419
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ endif
CGO_CFLAGS=-I/$(JAVA_HOME)/include -I/$(JAVA_HOME)/include/darwin
GOBIN=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))build/bin

BUILD_TAGS =
BUILD_FLAGS := $(shell echo "-ldflags '-X main.buildStamp=`date -u '+%Y-%m-%d.%H:%M:%S'` -X main.gitCommit=$(git rev-parse HEAD)'")

GO ?= latest
Expand All @@ -25,7 +24,7 @@ networkid ?= StatusChain
DOCKER_IMAGE_NAME ?= statusteam/status-go

DOCKER_TEST_WORKDIR = /go/src/github.com/status-im/status-go/
DOCKER_TEST_IMAGE = golang:1.9
DOCKER_TEST_IMAGE = golang:1.9

UNIT_TEST_PACKAGES := $(shell go list ./... | grep -v /vendor | grep -v /t/e2e | grep -v /t/destructive | grep -v /cmd | grep -v /lib)

Expand Down Expand Up @@ -84,6 +83,7 @@ statusgo-library: ##@cross-compile Build status-go as static library for current
@echo "Static library built:"
@ls -la $(GOBIN)/libstatus.*

docker-image: BUILD_TAGS ?= metrics prometheus
docker-image: ##@docker Build docker image (use DOCKER_IMAGE_NAME to set the image name)
@echo "Building docker image..."
docker build --file _assets/build/Dockerfile --build-arg "build_tags=$(BUILD_TAGS)" . -t $(DOCKER_IMAGE_NAME):latest
Expand Down

0 comments on commit 8b26419

Please sign in to comment.