Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

changed logic so make up won't run make demo if docker-compose up fails #335

Merged
merged 1 commit into from
Apr 26, 2023
Merged

changed logic so make up won't run make demo if docker-compose up fails #335

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions Makefile
View file
Open in desktop
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