Getting ready to pull in upstream

Makefile

@@ -138,6 +138,8 @@ update-settings-php:
 update-config-from-environment:
 	-docker-compose exec -T drupal with-contenv bash -lc "for_all_sites configure_islandora_module"
 	-docker-compose exec -T drupal with-contenv bash -lc "for_all_sites configure_jwt_module"
+	-docker-compose exec -T drupal with-contenv bash -lc "for_all_sites configure_islandora_default_module"
+	-docker-compose exec -T drupal with-contenv bash -lc "for_all_sites configure_search_api_solr_module"
 	-docker-compose exec -T drupal with-contenv bash -lc "for_all_sites configure_matomo_module"
 	-docker-compose exec -T drupal with-contenv bash -lc "for_all_sites configure_openseadragon"
 	-docker-compose exec -T drupal with-contenv bash -lc "for_all_sites configure_islandora_default_module"
@@ -333,7 +335,7 @@ local: generate-secrets
 	$(MAKE) pull ENVIRONMENT=local
 	mkdir -p $(CURDIR)/codebase
 	if [ -z "$$(ls -A $(CURDIR)/codebase)" ]; then \
-		docker container run --rm -v $(CURDIR)/codebase:/home/root $(REPOSITORY)/nginx:$(TAG) with-contenv bash -lc 'composer create-project islandora/islandora-sandbox:dev-install-profile /tmp/codebase; mv /tmp/codebase/* /home/root; cd /home/root'; \
+		docker container run --rm -v $(CURDIR)/codebase:/home/root $(REPOSITORY)/nginx:$(TAG) with-contenv bash -lc 'git clone https://github.com/islandora-devops/islandora-project /tmp/codebase; mv /tmp/codebase/* /home/root; cd /home/root; composer require islandora/islandora_profile:1.x-dev'; \
 	fi
 	docker-compose up -d
 	docker-compose exec -T drupal with-contenv bash -lc 'composer install; chown -R nginx:nginx .'

README.md

@@ -117,7 +117,7 @@ Drupal container.  This lets you update code using the IDE of your choice on you
 changes are automatically reflected on the Drupal container.  Simply place any exported Drupal site as
 the `codebase` folder in `isle-dc` and you're good to go.
 
-If you don't provide a codebase, you'll be given a vanilla Drupal 9 instance with the Islandora module
+If you don't provide a codebase, you'll be given a basic setup from vanilla Drupal 9 instance with the Islandora module
 installed and the bare minimum configured to run.  This is useful if you want to build your repository
 from scratch and avoid `islandora_defaults`.
 

sample.env

@@ -60,7 +60,7 @@ REPOSITORY=islandora
 
 # The version of the isle-buildkit images, non isle-buildkit images have
 # their versions specified explicitly in their respective docker-compose files.
-TAG=91f2b37fab22a2f44a76002cbfbc19f6ca7c53eb
+TAG=c2d65aee856887b49b2cbf889060e549a83e4946
 
 ###############################################################################
 # Exposed Containers & Ports