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.

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

hard code site root #349

Merged
merged 1 commit into from
Sep 9, 2024
Merged

Conversation

joshdentremont
Copy link
Collaborator

This should fix the issue introduced by drush 13 that stopped us from running certain drush commands before the site was installed. See Islandora-Devops/isle-site-template#58 for more details.

AFAIK the drupal root is always the same when running buildkit in either Isle-dc or site template so this should be fine.

To test:

  • build the drupal image in this PR with docker buildx bake drupal
  • create a new site with Site Template as normal
  • change the Dockerfile in Isle Site Template to say FROM islandora/drupal:local so that it builds from this image
  • build a new Drupal image in the site template
  • spin up site using docker compose --profile dev up -d as normal

@aOelschlager
Copy link
Contributor

aOelschlager commented Sep 9, 2024

I would add that there are other places where drupal:directory is referenced in the utilities.sh script that should be changed as well, in particular the update_settings_php that broke the isle-dc installation (has had fix with this pr)

Could the calls made to the drupal:directory be replaced with an environment variable instead?

@joshdentremont
Copy link
Collaborator Author

That drush command works once the site is installed, so everything else seems fine on my site template test so far.

Not sure about isle-dc, though. If it tries to run update_settings_php before doing a site install then it would likely fail, but I would think that should only run on installed sites.

@nigelgbanks nigelgbanks merged commit 04be359 into Islandora-Devops:main Sep 9, 2024
@nigelgbanks
Copy link
Contributor

I would add that there are other places where drupal:directory is referenced in the utilities.sh script that should be changed as well, in particular the update_settings_php that broke the isle-dc installation (has had fix with this pr)

Could the calls made to the drupal:directory be replaced with an environment variable instead?

There is an open issue to deprecate that whole file.

#260

@nigelgbanks
Copy link
Contributor

The others need to be changed as well... #350 has the required changes along with a few other bugs I found while looking into this.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants