Merge pull request #39 from EmakinaFR/feature/synchronization

Synchronization improvements
EmakinaFR · Apr 26, 2019 · 3c546d3 · 3c546d3
2 parents 1b1cdc6 + 40296d9
commit 3c546d3
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -34,7 +34,12 @@ jobs:
           command: 'cd ~/magento && make build start ps'
       - run:
           name: Try to access the setup page of Magento 2
-          command: 'curl --insecure --location --resolve "www.magento.localhost:443:127.0.0.1" https://www.magento.localhost/'
+          command: |
+              while [[ ! $(mutagen list) =~ 'Status: Watching for changes' ]]; do
+                echo 'Waiting for synchronization to complete...'
+                sleep 10
+              done
+              curl --insecure --location --resolve "www.magento.localhost:443:127.0.0.1" https://www.magento.localhost/setup/
 workflows:
   version: 2
   build:

diff --git a/Makefile b/Makefile
@@ -78,6 +78,10 @@ start: ## Start the environment
 		--sync-mode="two-way-resolved" \
 		--ignore-vcs --ignore=".idea" \
 		"${PROJECT_LOCATION}" "docker://${COMPOSE_PROJECT_NAME}_synchro/var/www/html/"
+	while [[ ! $$(mutagen list) =~ 'Status: Watching for changes' ]]; do \
+		echo 'Waiting for synchronization to complete...'; \
+		sleep 10; \
+	done
 
 stats: ## Print real-time statistics about containers ressources usage
 	docker stats $(docker ps --format={{.Names}})