Skip to content

Commit

Permalink
Update to latest starter site, and hard-code paths to support it.
Browse files Browse the repository at this point in the history
  • Loading branch information
nigelgbanks committed Sep 12, 2024
1 parent 5c83e05 commit 23ba4e0
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion code-server/rootfs/etc/confd/templates/tasks.json.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@
"type": "command",
"command": "shellCommand.execute",
"args": {
"command": "drush pm-list --field=path | sort -u | xargs -I{} echo $(drush drupal:directory)/{}",
"command": "drush pm-list --field=path | sort -u | xargs -I{} echo /var/www/drupal/web/{}",
"cwd": "/var/www/drupal",
"description": "Select Module/Theme"
}
Expand Down
8 changes: 4 additions & 4 deletions drupal/rootfs/etc/islandora/utilities.sh
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ function install_site {
use_existing_config_arg
site="${1}"
shift
drupal_root=$(drush drupal:directory)
drupal_root=/var/www/drupal/web
driver=$(drupal_site_env "${site}" "DB_DRIVER")
host=$(drupal_site_env "${site}" "DB_HOST")
port=$(drupal_site_env "${site}" "DB_PORT")
Expand Down Expand Up @@ -343,7 +343,7 @@ function allow_settings_modifications {
local site drupal_root subdir site_directory
site="${1}"
shift
drupal_root=$(drush drupal:directory)
drupal_root=/var/www/drupal/web
subdir=$(drupal_site_env "${site}" "SUBDIR")
site_directory=$(realpath "${drupal_root}/sites/${subdir}")

Expand All @@ -366,7 +366,7 @@ function restore_settings_ownership {
shift
previous_owner_group="${1}"
shift
drupal_root=$(drush drupal:directory)
drupal_root=/var/www/drupal/web
subdir=$(drupal_site_env "${site}" "SUBDIR")
site_directory=$(realpath "${drupal_root}/sites/${subdir}")

Expand Down Expand Up @@ -665,7 +665,7 @@ function set_site_uuid {
site="${1}"
shift
site_url=$(drupal_site_env "${site}" "SITE_URL")
drupal_root=$(drush drupal:directory)
drupal_root=/var/www/drupal/web
# Handle the case if config_dir is a relative path.
config_dir=$(realpath "$(drush --root="${drupal_root}" php:eval "echo \Drupal\Core\Site\Settings::get('config_sync_directory');")")
uuid=$(awk '/uuid/ { print $2 }' "${config_dir:?}/system.site.yml")
Expand Down
4 changes: 2 additions & 2 deletions test/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
FROM drupal

ARG TARGETARCH
ARG COMMIT=1.5.0
ARG COMMIT=a129ed9e57b0de749f7c32f61684d639031e74ae
ARG FILE=${COMMIT}.tar.gz
ARG URL=https://github.com/Islandora/islandora-starter-site/archive/${FILE}
ARG SHA256=600f6af9d8b09815d2f36ea24ed0ddd6be5735ad58dbe262bf2acb6bbace0978
ARG SHA256=a91638746f9acb61a83e2f03d5e62c844feede574f3b71795982d0aebe6967b7

# Platform agnostic does not require arch specific identifier.
RUN --mount=type=cache,id=test-downloads-${TARGETARCH},sharing=locked,target=/opt/downloads \
Expand Down

0 comments on commit 23ba4e0

Please sign in to comment.