Skip to content
This repository has been archived by the owner on Nov 8, 2018. It is now read-only.

Commit

Permalink
Merge pull request #12 from Sylius/pr/docker-compose-local-yaml
Browse files Browse the repository at this point in the history
Support docker-compose.local.yml
  • Loading branch information
Andreas de Pretis authored Oct 18, 2017
2 parents b27fec4 + 3e28acc commit 902d380
Showing 1 changed file with 8 additions and 0 deletions.
8 changes: 8 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
include .stub/*.mk

$(eval $(call defw,DOCKER_COMPOSE_LOCAL,docker-compose.local.yml))

ifneq ("$(wildcard $(DOCKER_COMPOSE_LOCAL))","")
DOCKER_COMPOSE_EXTRA_OPTIONS := -f $(DOCKER_COMPOSE_LOCAL)
endif


.PHONY: build
build:: ##@Docker Build the Sylius application image
docker build \
Expand All @@ -10,6 +17,7 @@ build:: ##@Docker Build the Sylius application image
up:: ##@Sylius Start the Sylius stack for development (using docker-compose)
docker-compose \
-f docker-compose.yml \
$(DOCKER_COMPOSE_EXTRA_OPTIONS) \
up \
--build

Expand Down

0 comments on commit 902d380

Please sign in to comment.