Skip to content

Commit

Permalink
change: change test-e2e target to depend on docker-multi-stage (#3000)
Browse files Browse the repository at this point in the history
* change: change test-e2e target to depend on docker-multi-stage

Signed-off-by: Jacob Lisi <jacob.t.lisi@gmail.com>

* update to use conditional make docker command based on OS/ARCH

Signed-off-by: Jacob Lisi <jacob.t.lisi@gmail.com>
  • Loading branch information
jtlisi authored Aug 7, 2020
1 parent 34a2ff1 commit ddb0eb4
Showing 1 changed file with 5 additions and 0 deletions.
5 changes: 5 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -124,14 +124,19 @@ deps: ## Ensures fresh go.mod and go.sum.
@go mod tidy
@go mod verify


.PHONY: docker
docker: ## Builds 'thanos' docker with no tag.
ifeq ($(OS)_$(ARCH), linux_x86_64)
docker: build
@echo ">> copying Thanos from $(PREFIX) to ./thanos_tmp_for_docker"
@cp $(PREFIX)/thanos ./thanos_tmp_for_docker
@echo ">> building docker image 'thanos'"
@docker build -t "thanos" .
@rm ./thanos_tmp_for_docker
else
docker: docker-multi-stage
endif

.PHONY: docker-multi-stage
docker-multi-stage: ## Builds 'thanos' docker image using multi-stage.
Expand Down

0 comments on commit ddb0eb4

Please sign in to comment.