Skip to content

Commit

Permalink
Fix directory check
Browse files Browse the repository at this point in the history
  • Loading branch information
DonRichards committed Oct 18, 2023
1 parent 1131304 commit efaa437
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions custom.Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -114,20 +114,20 @@ jhu_up: jhu_generate-secrets
fi
@echo "docker-compose.yml does not exist, creating starter site"
$(MAKE) starter-init ENVIRONMENT=starter_dev
if [ -z "$$(ls -A $(QUOTED_CURDIR)/codebase)" ]; then \
if [ ! -z "$$(ls -A $(QUOTED_CURDIR)/codebase)" ]; then \
echo "codebase/ directory is empty, cloning it"; \
docker container run --rm -v $(CURDIR)/codebase:/home/root $(REPOSITORY)/nginx:$(TAG) with-contenv bash -lc 'git clone -b main https://github.com/jhu-idc/idc-codebase /home/root;'; \
fi
$(MAKE) set-codebase-owner
$(MAKE) set-files-owner SRC=$(CURDIR)/codebase ENVIRONMENT=starter_dev
docker-compose up -d --remove-orphans
docker-compose exec -T drupal with-contenv bash -lc 'git config --global --add safe.directory /var/www/drupal/web/modules/contrib/islandora_fits'
# The rest of this should be moved into another function.
@echo "Wait for the /var/www/drupal directory to be available"
while ! docker compose exec -T drupal with-contenv bash -lc 'test -d /var/www/drupal'; do \
while ! docker compose exec -T drupal with-contenv bash -lc 'test -f /var/www/drupal/composer.json'; do \
echo "Waiting for /var/www/drupal directory to be available..."; \
sleep 2; \
done
docker-compose exec -T drupal with-contenv bash -lc 'git config --global --add safe.directory /var/www/drupal/web/modules/contrib/islandora_fits'
docker-compose exec -T drupal with-contenv bash -lc 'rm -rf vendor/ web/modules/contrib/* web/themes/contrib/*'
docker compose exec -T drupal with-contenv bash -lc 'chown -R nginx:nginx /var/www/drupal/ && su nginx -s /bin/bash -c "composer install"'
$(MAKE) set-codebase-owner
Expand Down

0 comments on commit efaa437

Please sign in to comment.