Skip to content

Commit

Permalink
changed logic for make up to not run make demo if docker-compose up f…
Browse files Browse the repository at this point in the history
…ails
  • Loading branch information
Josh D'entremont committed Apr 14, 2023
1 parent 92ff14f commit e47a666
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -257,9 +257,13 @@ docker-compose.yml: $(SERVICES:%=build/docker-compose/docker-compose.%.yml) .env

.PHONY: up
.SILENT: up
## Brings up the containers or builds demo if no containers were found.
## Brings up the containers or builds demo if no docker-compose.yml file is found.
up:
test -f docker-compose.yml && docker-compose up -d --remove-orphans || $(MAKE) demo
if [ -f docker-compose.yml ]; then \
docker-compose up -d --remove-orphans; \
else \
$(MAKE) demo; \
fi
@echo "\n Sleeping for 10 seconds to wait for Drupal to finish building.\n"
sleep 10
docker-compose exec -T drupal with-contenv bash -lc "for_all_sites update_settings_php"
Expand Down

0 comments on commit e47a666

Please sign in to comment.