Skip to content

Commit

Permalink
More adjustments for sandbox
Browse files Browse the repository at this point in the history
  • Loading branch information
DonRichards committed Oct 18, 2023
1 parent bbd3000 commit 9862b0e
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions custom.Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -113,11 +113,9 @@ jhu_up: jhu_generate-secrets
echo ""; \
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"; \
mkdir -p $(CURDIR)/codebase; \
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;'; \
git clone -b main https://github.com/jhu-idc/idc-codebase; \
echo "codebase/ was cloned"; \
fi
@echo "Wait for the /var/www/drupal/composer.json file to be available"
Expand All @@ -126,6 +124,7 @@ jhu_up: jhu_generate-secrets
sleep 2; \
done
$(MAKE) set-codebase-owner
$(MAKE) starter-init ENVIRONMENT=starter_dev
docker-compose up -d --remove-orphans
# The rest of this should be moved into another function.
docker-compose exec -T drupal with-contenv bash -lc 'rm -rf vendor/ web/modules/contrib/* web/themes/contrib/*'
Expand Down

0 comments on commit 9862b0e

Please sign in to comment.