diff --git a/.env b/.env
index 13c8a65ec..a022ecc31 100644
--- a/.env
+++ b/.env
@@ -1,9 +1,10 @@
+
# Environment variables defined in this file apply to both the Makefile and to
# docker-compose.yml
#
# Due to restrictions in the `env-file` format we cannot specify multi-line
# values for environment variables. For this reason the environment
-# variables are set on service definitions in the docker-compose.*.yml files,
+# variables are set on service definitions in the docker-compose.activemq.yml docker-compose.alpaca.yml docker-compose.blazegraph.yml docker-compose.cantaloupe.yml docker-compose.crayfish.mariadb.yml docker-compose.crayfish.postgresql.yml docker-compose.crayfish.yml docker-compose.crayfits.yml docker-compose.custom.yml docker-compose.demo.yml docker-compose.drupal-dev.yml docker-compose.drupal.mariadb.yml docker-compose.drupal.postgresql.yml docker-compose.drupal.yml docker-compose.env.yml docker-compose.etcd.yml docker-compose.fcrepo.mariadb.yml docker-compose.fcrepo.postgresql.yml docker-compose.fcrepo.yml docker-compose.idc-crayfish.yml docker-compose.idc-snapshot.yml docker-compose.local.yml docker-compose.mariadb.yml docker-compose.matomo.yml docker-compose.minio.yml docker-compose.postgresql.yml docker-compose.saml.yml docker-compose.sample.env.yml docker-compose.solr.yml docker-compose.static.yml docker-compose.testcafe.yml docker-compose.traefik.yml docker-compose.watchtower.yml files,
# rather than defined in `env-file` files.
# Determines which docker-compose file(s) will be used for the `drupal` service.
@@ -12,7 +13,7 @@
#
# If this value is changed, docker-compose.yml must be updated in order for it
# to take effect; e.g. 'make dev-up'
-ENVIRONMENT=local
+ENVIRONMENT=static
REQUIRED_SERIVCES=activemq alpaca cantaloupe idc-crayfish drupal mariadb solr idc-snapshot testcafe minio
###############################################################################
@@ -104,12 +105,12 @@ DRUPAL_DEFAULT_S3_USE_CUSTOMHOST=true
DRUPAL_DEFAULT_S3_USE_PATH_STYLE_ENDPOINT=true
DRUPAL_DEFAULT_S3_PRIVATE_PATH=pr
-# Drupal's Trusted Host List - This should be a comma separated list of strings, if you require more than one.
+# Drupal's Trusted Host List - This should be a comma separated list of strings, if you require more than one.
# (If you put DRUPAL prefix on it, things will start to fail as the drupal container will put any DRUPAL_* env vars
# into the fastcgi params file and the container will no longer start with this one there (the $ is probably the issue).
# https://github.com/jhu-idc/idc-isle-buildkit/blob/main/drupal/rootfs/etc/cont-init.d/97-setup-drupal-environment-variables.sh)
-#TRUSTED_HOST_LIST=^.+\.traefik\.me$
-TRUSTED_HOST_LIST=^.+\.traefik\.me$$,^.+\.library\.jhu\.edu$$
+#TRUSTED_HOST_LIST=^.+.traefik.me$
+TRUSTED_HOST_LIST=^.+.traefik.me$$,^.+.library.jhu.edu$$
# Google Tag Manager
DRUPAL_GTM_CONTAINER_ID=
@@ -157,4 +158,4 @@ TEST_OPERATION_TIMEOUT_MS=180000
MIGRATION_ASSETS_IMAGE_TAG=9519543.1637091427
ALPACA_HOMERUS_HTTP_SOCKET_TIMEOUT_MS=7200000
DRUPAL_JWT_EXPIRY_INTERVAL='+4 hour'
-ACTIVEMQ_WEB_PORT=8161
\ No newline at end of file
+DRUPAL_STATIC_TAG=static
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a5b86a546..4e00cc6f8 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -66,6 +66,7 @@ jobs:
test:
name: test
runs-on: ubuntu-latest
+ if: false # Don/Tim: disable testing for now
needs: build
strategy:
matrix: ${{ fromJSON(needs.build.outputs.matrix) }}
diff --git a/.gitignore b/.gitignore
index 039a3bbd0..644ee9512 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,6 +22,7 @@ codebase/.gitattributes
codebase/web/core/
codebase/web/modules/contrib/
codebase/web/themes/contrib/
+codebase/web/sites/default/services.yml
snapshot/data.tar
xdebug*
*.orig
@@ -112,4 +113,7 @@ screenshots/
/images
# Ignore Masonry
-codebase/web/libraries/masonry
\ No newline at end of file
+codebase/web/libraries/masonry
+
+# Composer authentication cache file, possibly generated by idc.Makefile for CI (ci.yml) authentication:
+**/auth.json
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index 5fde43cb8..961b5c08a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,18 +4,37 @@
ARG REPOSITORY
ARG TAG
FROM ${REPOSITORY}/drupal:${TAG}
+ARG PHPINI__MEMORY_LIMIT=256m
+ARG PHPINI__REALPATH_CACHE_SIZE=512k
+ARG PHPINI__REALPATH_CACHE_TTL=120
USER nginx
+# Allow build to override default envar used in above /etc/php6/conf.d/99-idc.ini:
+ENV IDC_MEMORY_LIMIT ${PHPINI__MEMORY_LIMIT}
+ENV IDC_REALPATH_CACHE_SIZE ${PHPINI__REALPATH_CACHE_SIZE}
+ENV IDC_REALPATH_CACHE_TTL ${PHPINI__REALPATH_CACHE_TTL}
+
# Run composer install as application user:
# Normal startup (via /init) must also happen as root
USER root
COPY --chown=nginx:www-data codebase /var/www/drupal/
COPY --chown=0:0 rootfs /
-
-RUN COMPOSER_MEMORY_LIMIT=-1 COMPOSER_DISCARD_CHANGES=true composer install --no-interaction --no-progress && \
- find /var/www/drupal/vendor \! -user nginx -exec chown -v nginx:www-data {} \; && \
+RUN \
+ /bin/rm -f /etc/cont-init.d/99-custom-setup.sh && \
+ for dirname in /var/www/drupal/{vendor,web} ; do \
+ if [ -d "$dirname" ] ; then \
+ find "$dirname" \! -user nginx -exec chown -v nginx:www-data {} \; ; \
+ fi ; \
+ done && \
chmod 0750 /var/www/drupal/fix_permissions.sh && \
- /var/www/drupal/fix_permissions.sh /var/www/drupal/web nginx && \
+ /var/www/drupal/fix_permissions.sh /var/www/drupal/web nginx
+
+# Run composer install as unprivileged user:
+USER nginx
+RUN \
+ COMPOSER_MEMORY_LIMIT=-1 COMPOSER_DISCARD_CHANGES=true composer install --no-interaction --no-progress --prefer-dist && \
composer clearcache
+# /init process must be run as root:
+USER root
diff --git a/Makefile b/Makefile
index bf5f77b8e..14f18d5ef 100644
--- a/Makefile
+++ b/Makefile
@@ -385,6 +385,7 @@ dev:
$(MAKE) install ENVIRONMENT=local
$(MAKE) hydrate ENVIRONMENT=local
+
.phony: confirm
confirm:
@echo "\n\n"
@@ -399,6 +400,11 @@ clean:
$(MAKE) confirm
-docker-compose down -v --remove-orphans
# $(MAKE) set-codebase-owner
+ echo "Preparing to forcibly remove 'codebase/' and certs/ directories"
+ echo "Note: elevating to root permissions via sudo to remove possible codebase/ with changed ownership"
+ echo "you might be prompted for local password for sudo permissions:"
sudo rm -fr codebase certs
# git clean -xffd .
git checkout codebase
+ echo "Clean completed successfully."
+
diff --git a/codebase/composer.json b/codebase/composer.json
index dd9a19a83..d0bef3f12 100644
--- a/codebase/composer.json
+++ b/codebase/composer.json
@@ -96,6 +96,18 @@
}
}
},
+ {
+ "type": "package",
+ "package": {
+ "name": "islandora/chullo",
+ "version": "dev-dev",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/Islandora/chullo.git",
+ "reference": "d563d5e48ef9b15dcf45029277bbc2f6eeef2454"
+ }
+ }
+ },
{
"type": "package",
"package": {
@@ -123,9 +135,9 @@
"drupal/contact_emails": "^1.19",
"drupal/contact_storage": "^1.1",
"drupal/content_browser": "^1.0@alpha",
- "drupal/core-composer-scaffold": "9.4.7",
- "drupal/core-project-message": "9.4.7",
- "drupal/core-recommended": "9.4.7",
+ "drupal/core-composer-scaffold": "9.4.9",
+ "drupal/core-project-message": "9.4.9",
+ "drupal/core-recommended": "9.4.9",
"drupal/core-vendor-hardening": "^9.2",
"drupal/devel": "^4.1",
"drupal/embed": "^1.4",
@@ -159,7 +171,7 @@
"jhu-idc/idc-ui-theme": "dev-main",
"jhu-idc/idc_defaults": "dev-main",
"jhu-idc/idc_export": "dev-main",
- "jhu-idc/idc_ui_module": "dev-main",
+ "jhu-idc/idc_ui_module": "dev-main#b9a08d3bc252ebad9d07fec2fc1c883e17d7f593",
"jhu-idc/islandora_defaults": "dev-8.x-1.x",
"jhu-idc/islandora_repository_reports": "dev-main",
"jhu-idc/migrate_file": "dev-8.x-1.x",
diff --git a/codebase/composer.lock b/codebase/composer.lock
index 011d99114..307551276 100644
--- a/codebase/composer.lock
+++ b/codebase/composer.lock
@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
- "content-hash": "68b9480ff903d9b7fb250a990877fb29",
+ "content-hash": "f4d2410121b9ff99bc852a498aa5e460",
"packages": [
{
"name": "alchemy/zippy",
@@ -2421,14 +2421,14 @@
"homepage": "https://www.drupal.org/u/matio89",
"role": "Maintainer"
},
- {
- "name": "fethi.krout",
- "homepage": "https://www.drupal.org/user/3206765"
- },
{
"name": "matio89",
"homepage": "https://www.drupal.org/user/2320090"
},
+ {
+ "name": "Musa.thomas",
+ "homepage": "https://www.drupal.org/user/1213824"
+ },
{
"name": "romainj",
"homepage": "https://www.drupal.org/user/370706"
@@ -2642,13 +2642,17 @@
],
"authors": [
{
- "name": "RobLoach",
- "homepage": "https://www.drupal.org/user/61114"
+ "name": "Anybody",
+ "homepage": "https://www.drupal.org/user/291091"
},
{
"name": "elachlan",
"homepage": "https://www.drupal.org/user/1021502"
},
+ {
+ "name": "Grevil",
+ "homepage": "https://www.drupal.org/user/3668491"
+ },
{
"name": "japerry",
"homepage": "https://www.drupal.org/user/45640"
@@ -2661,10 +2665,18 @@
"name": "podarok",
"homepage": "https://www.drupal.org/user/116002"
},
+ {
+ "name": "RobLoach",
+ "homepage": "https://www.drupal.org/user/61114"
+ },
{
"name": "soxofaan",
"homepage": "https://www.drupal.org/user/41478"
},
+ {
+ "name": "thomas.frobieter",
+ "homepage": "https://www.drupal.org/user/409335"
+ },
{
"name": "wundo",
"homepage": "https://www.drupal.org/user/25523"
@@ -2710,13 +2722,13 @@
"GPL-2.0-or-later"
],
"authors": [
- {
- "name": "Pasqualle",
- "homepage": "https://www.drupal.org/user/80733"
- },
{
"name": "codebymikey",
"homepage": "https://www.drupal.org/user/3573206"
+ },
+ {
+ "name": "Pasqualle",
+ "homepage": "https://www.drupal.org/user/80733"
}
],
"description": "Provides basic revert and update functionality for other modules",
@@ -3144,10 +3156,6 @@
{
"name": "scott_euser",
"homepage": "https://www.drupal.org/user/3267594"
- },
- {
- "name": "stuart.wilkes@actionaid.org",
- "homepage": "https://www.drupal.org/user/3584735"
}
],
"description": "Module to handle contact emails",
@@ -3194,6 +3202,10 @@
"GPL-2.0-or-later"
],
"authors": [
+ {
+ "name": "andypost",
+ "homepage": "https://www.drupal.org/user/118908"
+ },
{
"name": "Arla",
"homepage": "https://www.drupal.org/user/226712"
@@ -3202,10 +3214,6 @@
"name": "Berdir",
"homepage": "https://www.drupal.org/user/214652"
},
- {
- "name": "andypost",
- "homepage": "https://www.drupal.org/user/118908"
- },
{
"name": "jibran",
"homepage": "https://www.drupal.org/user/1198144"
@@ -3306,14 +3314,6 @@
"email": "christoffer.palm@oddhill.se",
"role": "Developer"
},
- {
- "name": "Steven Jones",
- "homepage": "https://www.drupal.org/user/99644"
- },
- {
- "name": "alex_b",
- "homepage": "https://www.drupal.org/user/53995"
- },
{
"name": "boshtian",
"homepage": "https://www.drupal.org/user/1773456"
@@ -3350,6 +3350,10 @@
"name": "nedjo",
"homepage": "https://www.drupal.org/user/4481"
},
+ {
+ "name": "NormySan",
+ "homepage": "https://www.drupal.org/user/112352"
+ },
{
"name": "patricksettle",
"homepage": "https://www.drupal.org/user/26618"
@@ -3358,6 +3362,10 @@
"name": "paulocs",
"homepage": "https://www.drupal.org/user/3640109"
},
+ {
+ "name": "Steven Jones",
+ "homepage": "https://www.drupal.org/user/99644"
+ },
{
"name": "tekante",
"homepage": "https://www.drupal.org/user/640024"
@@ -3384,16 +3392,16 @@
},
{
"name": "drupal/core",
- "version": "9.4.7",
+ "version": "9.4.9",
"source": {
"type": "git",
"url": "https://github.com/drupal/core.git",
- "reference": "247431af7e33a8cf7c46677a79336103c6e83db1"
+ "reference": "5fa639a3ddf0241db08b270f429f9da91d06fdfc"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/drupal/core/zipball/247431af7e33a8cf7c46677a79336103c6e83db1",
- "reference": "247431af7e33a8cf7c46677a79336103c6e83db1",
+ "url": "https://api.github.com/repos/drupal/core/zipball/5fa639a3ddf0241db08b270f429f9da91d06fdfc",
+ "reference": "5fa639a3ddf0241db08b270f429f9da91d06fdfc",
"shasum": ""
},
"require": {
@@ -3545,13 +3553,13 @@
],
"description": "Drupal is an open source content management platform powering millions of websites and applications.",
"support": {
- "source": "https://github.com/drupal/core/tree/9.4.7"
+ "source": "https://github.com/drupal/core/tree/9.4.9"
},
- "time": "2022-09-28T16:19:47+00:00"
+ "time": "2022-12-07T13:36:57+00:00"
},
{
"name": "drupal/core-composer-scaffold",
- "version": "9.4.7",
+ "version": "9.4.9",
"source": {
"type": "git",
"url": "https://github.com/drupal/core-composer-scaffold.git",
@@ -3595,13 +3603,13 @@
"drupal"
],
"support": {
- "source": "https://github.com/drupal/core-composer-scaffold/tree/9.4.7"
+ "source": "https://github.com/drupal/core-composer-scaffold/tree/9.4.9"
},
"time": "2022-06-19T16:14:23+00:00"
},
{
"name": "drupal/core-project-message",
- "version": "9.4.7",
+ "version": "9.4.9",
"source": {
"type": "git",
"url": "https://github.com/drupal/core-project-message.git",
@@ -3636,22 +3644,22 @@
"drupal"
],
"support": {
- "source": "https://github.com/drupal/core-project-message/tree/9.5.0-beta1"
+ "source": "https://github.com/drupal/core-project-message/tree/9.5.0-rc1"
},
"time": "2022-02-24T17:40:53+00:00"
},
{
"name": "drupal/core-recommended",
- "version": "9.4.7",
+ "version": "9.4.9",
"source": {
"type": "git",
"url": "https://github.com/drupal/core-recommended.git",
- "reference": "287868a598996f1eb04ea57dbefb741d3784db23"
+ "reference": "20a9b373c4b3fc23a56d9d0a591a3c3b3415d433"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/drupal/core-recommended/zipball/287868a598996f1eb04ea57dbefb741d3784db23",
- "reference": "287868a598996f1eb04ea57dbefb741d3784db23",
+ "url": "https://api.github.com/repos/drupal/core-recommended/zipball/20a9b373c4b3fc23a56d9d0a591a3c3b3415d433",
+ "reference": "20a9b373c4b3fc23a56d9d0a591a3c3b3415d433",
"shasum": ""
},
"require": {
@@ -3660,7 +3668,7 @@
"doctrine/annotations": "~1.13.2",
"doctrine/lexer": "~1.2.3",
"doctrine/reflection": "~1.2.3",
- "drupal/core": "9.4.7",
+ "drupal/core": "9.4.9",
"egulias/email-validator": "~3.2",
"guzzlehttp/guzzle": "~6.5.8",
"guzzlehttp/promises": "~1.5.1",
@@ -3722,9 +3730,9 @@
],
"description": "Core and its dependencies with known-compatible minor versions. Require this project INSTEAD OF drupal/core.",
"support": {
- "source": "https://github.com/drupal/core-recommended/tree/9.4.7"
+ "source": "https://github.com/drupal/core-recommended/tree/9.4.9"
},
- "time": "2022-09-28T16:19:47+00:00"
+ "time": "2022-12-07T13:36:57+00:00"
},
{
"name": "drupal/core-vendor-hardening",
@@ -3916,6 +3924,10 @@
"GPL-2.0-or-later"
],
"authors": [
+ {
+ "name": "cs_shadow",
+ "homepage": "https://www.drupal.org/user/2828287"
+ },
{
"name": "Dave Reid",
"homepage": "https://www.drupal.org/user/53892"
@@ -3928,10 +3940,6 @@
"name": "Drupal Media Team",
"homepage": "https://www.drupal.org/user/3260690"
},
- {
- "name": "cs_shadow",
- "homepage": "https://www.drupal.org/user/2828287"
- },
{
"name": "phenaproxima",
"homepage": "https://www.drupal.org/user/205645"
@@ -4008,10 +4016,6 @@
"name": "Drupal Media Team",
"homepage": "https://www.drupal.org/user/3260690"
},
- {
- "name": "Primsi",
- "homepage": "https://www.drupal.org/user/282629"
- },
{
"name": "marcingy",
"homepage": "https://www.drupal.org/user/77320"
@@ -4020,6 +4024,10 @@
"name": "oknate",
"homepage": "https://www.drupal.org/user/471638"
},
+ {
+ "name": "Primsi",
+ "homepage": "https://www.drupal.org/user/282629"
+ },
{
"name": "samuel.mortenson",
"homepage": "https://www.drupal.org/user/2582268"
@@ -4074,6 +4082,10 @@
"GPL-2.0+"
],
"authors": [
+ {
+ "name": "cs_shadow",
+ "homepage": "https://www.drupal.org/user/2828287"
+ },
{
"name": "Dave Reid",
"homepage": "https://www.drupal.org/user/53892"
@@ -4086,14 +4098,6 @@
"name": "Drupal Media Team",
"homepage": "https://www.drupal.org/user/3260690"
},
- {
- "name": "Wim Leers",
- "homepage": "https://www.drupal.org/user/99777"
- },
- {
- "name": "cs_shadow",
- "homepage": "https://www.drupal.org/user/2828287"
- },
{
"name": "oknate",
"homepage": "https://www.drupal.org/user/471638"
@@ -4105,6 +4109,10 @@
{
"name": "slashrsm",
"homepage": "https://www.drupal.org/user/744628"
+ },
+ {
+ "name": "Wim Leers",
+ "homepage": "https://www.drupal.org/user/99777"
}
],
"description": "Allows any entity to be embedded within a text area using a WYSIWYG editor.",
@@ -4247,14 +4255,14 @@
"GPL-2.0-or-later"
],
"authors": [
- {
- "name": "Crell",
- "homepage": "https://www.drupal.org/user/26398"
- },
{
"name": "ahebrank",
"homepage": "https://www.drupal.org/user/3190515"
},
+ {
+ "name": "Crell",
+ "homepage": "https://www.drupal.org/user/26398"
+ },
{
"name": "eaton",
"homepage": "https://www.drupal.org/user/16496"
@@ -4372,14 +4380,6 @@
"name": "See all contributors",
"homepage": "https://www.drupal.org/node/2348769/committers"
},
- {
- "name": "StryKaizer",
- "homepage": "https://www.drupal.org/user/462700"
- },
- {
- "name": "borisson_",
- "homepage": "https://www.drupal.org/user/2393360"
- },
{
"name": "drunken monkey",
"homepage": "https://www.drupal.org/user/205582"
@@ -4387,6 +4387,14 @@
{
"name": "mkalkbrenner",
"homepage": "https://www.drupal.org/user/124705"
+ },
+ {
+ "name": "Nick_vh",
+ "homepage": "https://www.drupal.org/user/122682"
+ },
+ {
+ "name": "StryKaizer",
+ "homepage": "https://www.drupal.org/user/462700"
}
],
"description": "The Facet module allows site builders to easily create and manage faceted search interfaces.",
@@ -4471,10 +4479,6 @@
{
"name": "nedjo",
"homepage": "https://www.drupal.org/user/4481"
- },
- {
- "name": "tim.plunkett",
- "homepage": "https://www.drupal.org/user/241634"
}
],
"description": "Enables administrators to package configuration into modules",
@@ -4523,10 +4527,6 @@
"name": "Hydra",
"homepage": "https://www.drupal.org/user/647364"
},
- {
- "name": "Stalski",
- "homepage": "https://www.drupal.org/user/322618"
- },
{
"name": "jyve",
"homepage": "https://www.drupal.org/user/591438"
@@ -4535,6 +4535,10 @@
"name": "nils.destoop",
"homepage": "https://www.drupal.org/user/361625"
},
+ {
+ "name": "Stalski",
+ "homepage": "https://www.drupal.org/user/322618"
+ },
{
"name": "swentel",
"homepage": "https://www.drupal.org/user/107403"
@@ -4583,10 +4587,6 @@
"GPL-2.0-or-later"
],
"authors": [
- {
- "name": "RobLoach",
- "homepage": "https://www.drupal.org/user/61114"
- },
{
"name": "japerry",
"homepage": "https://www.drupal.org/user/45640"
@@ -4602,6 +4602,10 @@
{
"name": "markus_petrux",
"homepage": "https://www.drupal.org/user/39593"
+ },
+ {
+ "name": "RobLoach",
+ "homepage": "https://www.drupal.org/user/61114"
}
],
"description": "The Field Permissions module allows site administrators to set field-level permissions to edit, view and create fields on any entity.",
@@ -4703,8 +4707,8 @@
"homepage": "https://www.drupal.org/user/32403"
},
{
- "name": "dagomar",
- "homepage": "https://www.drupal.org/user/174986"
+ "name": "timohuisman",
+ "homepage": "https://www.drupal.org/user/3558376"
}
],
"description": "Allows to replace files",
@@ -5266,8 +5270,8 @@
"dev-3.x": "3.x-dev"
},
"drupal": {
- "version": "8.x-3.0-beta1+4-dev",
- "datestamp": "1635189814",
+ "version": "8.x-3.0-beta2+1-dev",
+ "datestamp": "1635235433",
"security-coverage": {
"status": "not-covered",
"message": "Dev releases are not covered by Drupal security advisories."
@@ -5279,10 +5283,6 @@
"GPL-2.0-or-later"
],
"authors": [
- {
- "name": "Pol",
- "homepage": "https://www.drupal.org/user/47194"
- },
{
"name": "joseph.olstad",
"homepage": "https://www.drupal.org/user/1321830"
@@ -5291,6 +5291,10 @@
"name": "podarok",
"homepage": "https://www.drupal.org/user/116002"
},
+ {
+ "name": "Pol",
+ "homepage": "https://www.drupal.org/user/47194"
+ },
{
"name": "rjacobs",
"homepage": "https://www.drupal.org/user/422459"
@@ -5619,8 +5623,8 @@
"dev-1.x": "1.x-dev"
},
"drupal": {
- "version": "8.x-1.0+2-dev",
- "datestamp": "1593167028",
+ "version": "8.x-1.1+1-dev",
+ "datestamp": "1660726104",
"security-coverage": {
"status": "not-covered",
"message": "Dev releases are not covered by Drupal security advisories."
@@ -5632,14 +5636,6 @@
"GPL-2.0-or-later"
],
"authors": [
- {
- "name": "DanielFbrg",
- "homepage": "https://www.drupal.org/user/884704"
- },
- {
- "name": "JMOmandown",
- "homepage": "https://www.drupal.org/user/1844552"
- },
{
"name": "alextataurov",
"homepage": "https://www.drupal.org/user/957718"
@@ -5648,6 +5644,14 @@
"name": "axelm",
"homepage": "https://www.drupal.org/user/1065700"
},
+ {
+ "name": "DanielFbrg",
+ "homepage": "https://www.drupal.org/user/884704"
+ },
+ {
+ "name": "JMOmandown",
+ "homepage": "https://www.drupal.org/user/1844552"
+ },
{
"name": "ram4nd",
"homepage": "https://www.drupal.org/user/601534"
@@ -5700,16 +5704,16 @@
"authors": [
{
"name": "Peter Majmesku",
- "homepage": "https://www.drupal.org/user/786132",
+ "homepage": "https://www.drupal.org/user/1529744",
"email": "majmesku@publicplan.de"
},
{
- "name": "SaschaHannes",
- "homepage": "https://www.drupal.org/user/3536189"
+ "name": "Peter Majmesku",
+ "homepage": "https://www.drupal.org/user/786132"
},
{
- "name": "marcoliver",
- "homepage": "https://www.drupal.org/user/1529744"
+ "name": "Wassilissa Elrich",
+ "homepage": "https://www.drupal.org/user/3729479"
}
],
"description": "Restricts access to nodes by taxonomy terms in relation to users and their roles.",
@@ -5778,6 +5782,83 @@
"source": "https://git.drupalcode.org/project/prepopulate"
}
},
+ {
+ "name": "drupal/rdf",
+ "version": "2.1.1",
+ "source": {
+ "type": "git",
+ "url": "https://git.drupalcode.org/project/rdf.git",
+ "reference": "2.1.1"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://ftp.drupal.org/files/projects/rdf-2.1.1.zip",
+ "reference": "2.1.1",
+ "shasum": "9c897d1313abdabbe80806d79643faffaa0b2466"
+ },
+ "require": {
+ "drupal/core": "^9.4 || ^10.0",
+ "easyrdf/easyrdf": "^0.9 || ^1.0"
+ },
+ "type": "drupal-module",
+ "extra": {
+ "drupal": {
+ "version": "2.1.1",
+ "datestamp": "1666340902",
+ "security-coverage": {
+ "status": "covered",
+ "message": "Covered by Drupal's security advisory policy"
+ }
+ }
+ },
+ "notification-url": "https://packages.drupal.org/8/downloads",
+ "license": [
+ "GPL-2.0-or-later"
+ ],
+ "authors": [
+ {
+ "name": "Arto",
+ "homepage": "https://www.drupal.org/user/26089"
+ },
+ {
+ "name": "bbrala",
+ "homepage": "https://www.drupal.org/user/3366066"
+ },
+ {
+ "name": "bhuga",
+ "homepage": "https://www.drupal.org/user/186547"
+ },
+ {
+ "name": "febbraro",
+ "homepage": "https://www.drupal.org/user/43670"
+ },
+ {
+ "name": "jmiccolis",
+ "homepage": "https://www.drupal.org/user/31731"
+ },
+ {
+ "name": "linclark",
+ "homepage": "https://www.drupal.org/user/396253"
+ },
+ {
+ "name": "miglius",
+ "homepage": "https://www.drupal.org/user/18741"
+ },
+ {
+ "name": "scor",
+ "homepage": "https://www.drupal.org/user/52142"
+ },
+ {
+ "name": "smustgrave",
+ "homepage": "https://www.drupal.org/user/3252890"
+ }
+ ],
+ "description": "Enriches your content with metadata to let other applications (e.g. search engines, aggregators) better understand its relationships and attributes",
+ "homepage": "https://www.drupal.org/project/rdf",
+ "support": {
+ "source": "https://git.drupalcode.org/project/rdf"
+ }
+ },
{
"name": "drupal/rdfui",
"version": "1.0.0-beta4",
@@ -5794,6 +5875,7 @@
},
"require": {
"drupal/core": "^8 || ^9",
+ "drupal/rdf": "*",
"easyrdf/easyrdf": "^1.0"
},
"type": "drupal-module",
@@ -6071,7 +6153,7 @@
"authors": [
{
"name": "Abhishek Anand",
- "homepage": "https://www.drupal.org/user/213194",
+ "homepage": "https://www.drupal.org/user/1790054",
"email": "fly2abhishek@gmail.com"
},
{
@@ -6079,12 +6161,8 @@
"homepage": "https://www.drupal.org/u/jansete"
},
{
- "name": "cmlara",
- "homepage": "https://www.drupal.org/user/1790054"
- },
- {
- "name": "jansete",
- "homepage": "https://www.drupal.org/user/1358146"
+ "name": "Manuel Garcia",
+ "homepage": "https://www.drupal.org/user/213194"
},
{
"name": "naveenvalecha",
@@ -6093,6 +6171,14 @@
{
"name": "ram4nd",
"homepage": "https://www.drupal.org/user/601534"
+ },
+ {
+ "name": "Rhane",
+ "homepage": "https://www.drupal.org/user/2655479"
+ },
+ {
+ "name": "ron_s",
+ "homepage": "https://www.drupal.org/user/184990"
}
],
"description": "Adds an Amazon Simple Storage Service-based remote file system to Drupal.",
@@ -6251,10 +6337,6 @@
"name": "Other contributors",
"homepage": "https://www.drupal.org/node/982682/committers"
},
- {
- "name": "amateescu",
- "homepage": "https://www.drupal.org/user/729614"
- },
{
"name": "cspitzlay",
"homepage": "https://www.drupal.org/user/419305"
@@ -6266,6 +6348,10 @@
{
"name": "mkalkbrenner",
"homepage": "https://www.drupal.org/user/124705"
+ },
+ {
+ "name": "Nick_vh",
+ "homepage": "https://www.drupal.org/user/122682"
}
],
"description": "Offers an implementation of the Search API that uses an Apache Solr server for indexing content.",
@@ -6562,8 +6648,8 @@
"role": "Maintainer"
},
{
- "name": "ivnish",
- "homepage": "https://www.drupal.org/user/3547706"
+ "name": "Krzysztof Domański",
+ "homepage": "https://www.drupal.org/user/3572982"
}
],
"description": "Transliteration for all uploading files (includes fields and ckeditor inline upload)",
@@ -6611,10 +6697,6 @@
"GPL-2.0+"
],
"authors": [
- {
- "name": "Steven Jones",
- "homepage": "https://www.drupal.org/user/99644"
- },
{
"name": "amoebanath",
"homepage": "https://www.drupal.org/user/2810799"
@@ -6634,6 +6716,10 @@
{
"name": "nerdstein",
"homepage": "https://www.drupal.org/user/1557710"
+ },
+ {
+ "name": "Steven Jones",
+ "homepage": "https://www.drupal.org/user/99644"
}
],
"description": "Plugin to export views data into various file formats.",
@@ -6675,10 +6761,6 @@
"GPL-2.0-or-later"
],
"authors": [
- {
- "name": "Dave Reid",
- "homepage": "https://www.drupal.org/user/53892"
- },
{
"name": "agentrickard",
"homepage": "https://www.drupal.org/user/20975"
@@ -6695,6 +6777,10 @@
"name": "caroltron",
"homepage": "https://www.drupal.org/user/171342"
},
+ {
+ "name": "Dave Reid",
+ "homepage": "https://www.drupal.org/user/53892"
+ },
{
"name": "robeano",
"homepage": "https://www.drupal.org/user/67660"
@@ -6748,10 +6834,6 @@
"GPL-2.0+"
],
"authors": [
- {
- "name": "Dave Reid",
- "homepage": "https://www.drupal.org/user/53892"
- },
{
"name": "agentrickard",
"homepage": "https://www.drupal.org/user/20975"
@@ -6761,12 +6843,8 @@
"homepage": "https://www.drupal.org/user/81067"
},
{
- "name": "robeano",
- "homepage": "https://www.drupal.org/user/67660"
- },
- {
- "name": "stevector",
- "homepage": "https://www.drupal.org/user/179805"
+ "name": "larowlan",
+ "homepage": "https://www.drupal.org/user/395439"
}
],
"description": "Hierarchical access control for content.",
@@ -7842,7 +7920,7 @@
"type": "drupal-module",
"notification-url": "https://packagist.org/downloads/",
"license": [
- "GPL-2.0+"
+ "GPL-2.0-or-later"
],
"description": "Enables Technical Metadata derivative generation.",
"homepage": "https://www.drupal.org/project/islandora_fits",
@@ -7904,8 +7982,9 @@
],
"support": {
"issues": "https://github.com/Islandora/documentation/issues",
- "source": "https://github.com/Islandora/carapace/tree/4.0.0"
+ "source": "https://github.com/Islandora/carapace/tree/4.0.1"
},
+ "abandoned": true,
"time": "2021-04-21T13:06:26+00:00"
},
{
@@ -7916,58 +7995,7 @@
"url": "https://github.com/Islandora/chullo.git",
"reference": "d563d5e48ef9b15dcf45029277bbc2f6eeef2454"
},
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/Islandora/chullo/zipball/d563d5e48ef9b15dcf45029277bbc2f6eeef2454",
- "reference": "d563d5e48ef9b15dcf45029277bbc2f6eeef2454",
- "shasum": ""
- },
- "require": {
- "easyrdf/easyrdf": "^0.9 || ^1",
- "guzzlehttp/guzzle": "^6.1.0",
- "ml/json-ld": "^1.0.4",
- "php": "^7.3 || ^7.4"
- },
- "require-dev": {
- "mockery/mockery": "^0.9",
- "phpunit/phpunit": "^9.0",
- "sebastian/phpcpd": "^6.0",
- "squizlabs/php_codesniffer": "^3.0"
- },
- "default-branch": true,
"type": "library",
- "autoload": {
- "psr-4": {
- "Islandora\\Chullo\\": "src/"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Islandora Foundation",
- "email": "community@islandora.ca",
- "role": "Owner"
- },
- {
- "name": "Daniel Lamb",
- "email": "dlamb@islandora.ca",
- "role": "Maintainer"
- },
- {
- "name": "Nick Ruest",
- "email": "ruestn@gmail.com",
- "role": "Maintainer"
- }
- ],
- "description": "A PHP client for interacting with a Fedora 4 server.",
- "homepage": "https://github.com/Islandora/chullo",
- "support": {
- "issues": "https://github.com/Islandora/documentation/issues",
- "source": "https://github.com/Islandora/chullo/tree/1.2.0"
- },
"time": "2021-05-05T17:38:36+00:00"
},
{
@@ -8269,12 +8297,12 @@
"source": {
"type": "git",
"url": "https://github.com/jhu-idc/idc-ui-theme.git",
- "reference": "9c698028604b60c72e2e4f58265d8275e9a2ae77"
+ "reference": "1d583a018f7cdf17e989ac672d0fe8cc7d844429"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/jhu-idc/idc-ui-theme/zipball/9c698028604b60c72e2e4f58265d8275e9a2ae77",
- "reference": "9c698028604b60c72e2e4f58265d8275e9a2ae77",
+ "url": "https://api.github.com/repos/jhu-idc/idc-ui-theme/zipball/1d583a018f7cdf17e989ac672d0fe8cc7d844429",
+ "reference": "1d583a018f7cdf17e989ac672d0fe8cc7d844429",
"shasum": ""
},
"default-branch": true,
@@ -8284,7 +8312,7 @@
"source": "https://github.com/jhu-idc/idc-ui-theme/tree/main",
"issues": "https://github.com/jhu-idc/idc-ui-theme/issues"
},
- "time": "2022-12-02T19:51:45+00:00"
+ "time": "2022-12-14T18:10:29+00:00"
},
{
"name": "jhu-idc/idc_defaults",
@@ -8354,12 +8382,12 @@
"source": {
"type": "git",
"url": "https://github.com/jhu-idc/idc_ui_module.git",
- "reference": "be2d6d0bd50dd062c16b9702fee5b2f6f518526a"
+ "reference": "b9a08d3bc252ebad9d07fec2fc1c883e17d7f593"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/jhu-idc/idc_ui_module/zipball/be2d6d0bd50dd062c16b9702fee5b2f6f518526a",
- "reference": "be2d6d0bd50dd062c16b9702fee5b2f6f518526a",
+ "url": "https://api.github.com/repos/jhu-idc/idc_ui_module/zipball/b9a08d3bc252ebad9d07fec2fc1c883e17d7f593",
+ "reference": "b9a08d3bc252ebad9d07fec2fc1c883e17d7f593",
"shasum": ""
},
"default-branch": true,
@@ -8369,7 +8397,7 @@
"source": "https://github.com/jhu-idc/idc_ui_module/tree/main",
"issues": "https://github.com/jhu-idc/idc_ui_module/issues"
},
- "time": "2022-06-17T19:59:58+00:00"
+ "time": "2022-12-14T16:34:58+00:00"
},
{
"name": "jhu-idc/islandora_defaults",
@@ -9332,9 +9360,13 @@
],
"support": {
"issues": "https://github.com/maennchen/ZipStream-PHP/issues",
- "source": "https://github.com/maennchen/ZipStream-PHP/tree/master"
+ "source": "https://github.com/maennchen/ZipStream-PHP/tree/2.1.0"
},
"funding": [
+ {
+ "url": "https://github.com/maennchen",
+ "type": "github"
+ },
{
"url": "https://opencollective.com/zipstream",
"type": "open_collective"
@@ -9421,110 +9453,6 @@
},
"time": "2022-08-18T16:18:26+00:00"
},
- {
- "name": "ml/iri",
- "version": "1.1.4",
- "target-dir": "ML/IRI",
- "source": {
- "type": "git",
- "url": "https://github.com/lanthaler/IRI.git",
- "reference": "cbd44fa913e00ea624241b38cefaa99da8d71341"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/lanthaler/IRI/zipball/cbd44fa913e00ea624241b38cefaa99da8d71341",
- "reference": "cbd44fa913e00ea624241b38cefaa99da8d71341",
- "shasum": ""
- },
- "require": {
- "lib-pcre": ">=4.0",
- "php": ">=5.3.0"
- },
- "type": "library",
- "autoload": {
- "psr-0": {
- "ML\\IRI": ""
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Markus Lanthaler",
- "email": "mail@markus-lanthaler.com",
- "homepage": "http://www.markus-lanthaler.com",
- "role": "Developer"
- }
- ],
- "description": "IRI handling for PHP",
- "homepage": "http://www.markus-lanthaler.com",
- "keywords": [
- "URN",
- "iri",
- "uri",
- "url"
- ],
- "support": {
- "issues": "https://github.com/lanthaler/IRI/issues",
- "source": "https://github.com/lanthaler/IRI/tree/master"
- },
- "time": "2014-01-21T13:43:39+00:00"
- },
- {
- "name": "ml/json-ld",
- "version": "1.2.0",
- "source": {
- "type": "git",
- "url": "https://github.com/lanthaler/JsonLD.git",
- "reference": "c74a1aed5979ed1cfb1be35a55a305fd30e30b93"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/lanthaler/JsonLD/zipball/c74a1aed5979ed1cfb1be35a55a305fd30e30b93",
- "reference": "c74a1aed5979ed1cfb1be35a55a305fd30e30b93",
- "shasum": ""
- },
- "require": {
- "ext-json": "*",
- "ml/iri": "^1.1.1",
- "php": ">=5.3.0"
- },
- "require-dev": {
- "json-ld/tests": "1.0",
- "phpunit/phpunit": "^4"
- },
- "type": "library",
- "autoload": {
- "psr-4": {
- "ML\\JsonLD\\": ""
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Markus Lanthaler",
- "email": "mail@markus-lanthaler.com",
- "homepage": "http://www.markus-lanthaler.com",
- "role": "Developer"
- }
- ],
- "description": "JSON-LD Processor for PHP",
- "homepage": "http://www.markus-lanthaler.com",
- "keywords": [
- "JSON-LD",
- "jsonld"
- ],
- "support": {
- "issues": "https://github.com/lanthaler/JsonLD/issues",
- "source": "https://github.com/lanthaler/JsonLD/tree/1.2.0"
- },
- "time": "2020-06-16T17:45:06+00:00"
- },
{
"name": "monolog/monolog",
"version": "1.26.1",
@@ -9801,16 +9729,16 @@
},
{
"name": "nikic/php-parser",
- "version": "v4.15.1",
+ "version": "v4.15.2",
"source": {
"type": "git",
"url": "https://github.com/nikic/PHP-Parser.git",
- "reference": "0ef6c55a3f47f89d7a374e6f835197a0b5fcf900"
+ "reference": "f59bbe44bf7d96f24f3e2b4ddc21cd52c1d2adbc"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/0ef6c55a3f47f89d7a374e6f835197a0b5fcf900",
- "reference": "0ef6c55a3f47f89d7a374e6f835197a0b5fcf900",
+ "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/f59bbe44bf7d96f24f3e2b4ddc21cd52c1d2adbc",
+ "reference": "f59bbe44bf7d96f24f3e2b4ddc21cd52c1d2adbc",
"shasum": ""
},
"require": {
@@ -9851,9 +9779,9 @@
],
"support": {
"issues": "https://github.com/nikic/PHP-Parser/issues",
- "source": "https://github.com/nikic/PHP-Parser/tree/v4.15.1"
+ "source": "https://github.com/nikic/PHP-Parser/tree/v4.15.2"
},
- "time": "2022-09-04T07:30:47+00:00"
+ "time": "2022-11-12T15:38:23+00:00"
},
{
"name": "pear/archive_tar",
@@ -13483,16 +13411,16 @@
},
{
"name": "symfony/console",
- "version": "v4.4.47",
+ "version": "v4.4.49",
"source": {
"type": "git",
"url": "https://github.com/symfony/console.git",
- "reference": "4f40012db8d55c956406890b5720f686fee7f7b7"
+ "reference": "33fa45ffc81fdcc1ca368d4946da859c8cdb58d9"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/console/zipball/4f40012db8d55c956406890b5720f686fee7f7b7",
- "reference": "4f40012db8d55c956406890b5720f686fee7f7b7",
+ "url": "https://api.github.com/repos/symfony/console/zipball/33fa45ffc81fdcc1ca368d4946da859c8cdb58d9",
+ "reference": "33fa45ffc81fdcc1ca368d4946da859c8cdb58d9",
"shasum": ""
},
"require": {
@@ -13553,7 +13481,7 @@
"description": "Eases the creation of beautiful and testable command line interfaces",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/console/tree/v4.4.47"
+ "source": "https://github.com/symfony/console/tree/v4.4.49"
},
"funding": [
{
@@ -13569,7 +13497,7 @@
"type": "tidelift"
}
],
- "time": "2022-10-04T05:58:30+00:00"
+ "time": "2022-11-05T17:10:16+00:00"
},
{
"name": "symfony/css-selector",
@@ -13708,16 +13636,16 @@
},
{
"name": "symfony/dependency-injection",
- "version": "v4.4.44",
+ "version": "v4.4.49",
"source": {
"type": "git",
"url": "https://github.com/symfony/dependency-injection.git",
- "reference": "25502a57182ba1e15da0afd64c975cae4d0a1471"
+ "reference": "9065fe97dbd38a897e95ea254eb5ddfe1310f734"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/25502a57182ba1e15da0afd64c975cae4d0a1471",
- "reference": "25502a57182ba1e15da0afd64c975cae4d0a1471",
+ "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/9065fe97dbd38a897e95ea254eb5ddfe1310f734",
+ "reference": "9065fe97dbd38a897e95ea254eb5ddfe1310f734",
"shasum": ""
},
"require": {
@@ -13774,7 +13702,7 @@
"description": "Allows you to standardize and centralize the way objects are constructed in your application",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/dependency-injection/tree/v4.4.44"
+ "source": "https://github.com/symfony/dependency-injection/tree/v4.4.49"
},
"funding": [
{
@@ -13790,7 +13718,7 @@
"type": "tidelift"
}
],
- "time": "2022-07-20T09:59:04+00:00"
+ "time": "2022-11-16T16:18:09+00:00"
},
{
"name": "symfony/deprecation-contracts",
@@ -14515,16 +14443,16 @@
},
{
"name": "symfony/http-foundation",
- "version": "v4.4.47",
+ "version": "v4.4.49",
"source": {
"type": "git",
"url": "https://github.com/symfony/http-foundation.git",
- "reference": "7eea76ae186c68466e7676e62812ce2769f96811"
+ "reference": "191413c7b832c015bb38eae963f2e57498c3c173"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/http-foundation/zipball/7eea76ae186c68466e7676e62812ce2769f96811",
- "reference": "7eea76ae186c68466e7676e62812ce2769f96811",
+ "url": "https://api.github.com/repos/symfony/http-foundation/zipball/191413c7b832c015bb38eae963f2e57498c3c173",
+ "reference": "191413c7b832c015bb38eae963f2e57498c3c173",
"shasum": ""
},
"require": {
@@ -14563,7 +14491,7 @@
"description": "Defines an object-oriented layer for the HTTP specification",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/http-foundation/tree/v4.4.47"
+ "source": "https://github.com/symfony/http-foundation/tree/v4.4.49"
},
"funding": [
{
@@ -14579,20 +14507,20 @@
"type": "tidelift"
}
],
- "time": "2022-10-01T21:39:02+00:00"
+ "time": "2022-11-04T16:17:57+00:00"
},
{
"name": "symfony/http-kernel",
- "version": "v4.4.47",
+ "version": "v4.4.49",
"source": {
"type": "git",
"url": "https://github.com/symfony/http-kernel.git",
- "reference": "91cf5dbc9ea4d902470e596246a736179acfb79d"
+ "reference": "4e36db8103062c62b3882b1bd297b02de6b021c4"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/http-kernel/zipball/91cf5dbc9ea4d902470e596246a736179acfb79d",
- "reference": "91cf5dbc9ea4d902470e596246a736179acfb79d",
+ "url": "https://api.github.com/repos/symfony/http-kernel/zipball/4e36db8103062c62b3882b1bd297b02de6b021c4",
+ "reference": "4e36db8103062c62b3882b1bd297b02de6b021c4",
"shasum": ""
},
"require": {
@@ -14667,7 +14595,7 @@
"description": "Provides a structured process for converting a Request into a Response",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/http-kernel/tree/v4.4.47"
+ "source": "https://github.com/symfony/http-kernel/tree/v4.4.49"
},
"funding": [
{
@@ -14683,7 +14611,7 @@
"type": "tidelift"
}
],
- "time": "2022-10-12T07:05:45+00:00"
+ "time": "2022-11-28T17:58:43+00:00"
},
{
"name": "symfony/mime",
@@ -14935,16 +14863,16 @@
},
{
"name": "symfony/polyfill-intl-grapheme",
- "version": "v1.26.0",
+ "version": "v1.27.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-intl-grapheme.git",
- "reference": "433d05519ce6990bf3530fba6957499d327395c2"
+ "reference": "511a08c03c1960e08a883f4cffcacd219b758354"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/433d05519ce6990bf3530fba6957499d327395c2",
- "reference": "433d05519ce6990bf3530fba6957499d327395c2",
+ "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/511a08c03c1960e08a883f4cffcacd219b758354",
+ "reference": "511a08c03c1960e08a883f4cffcacd219b758354",
"shasum": ""
},
"require": {
@@ -14956,7 +14884,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-main": "1.26-dev"
+ "dev-main": "1.27-dev"
},
"thanks": {
"name": "symfony/polyfill",
@@ -14996,7 +14924,7 @@
"shim"
],
"support": {
- "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.26.0"
+ "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.27.0"
},
"funding": [
{
@@ -15012,7 +14940,7 @@
"type": "tidelift"
}
],
- "time": "2022-05-24T11:49:31+00:00"
+ "time": "2022-11-03T14:55:06+00:00"
},
{
"name": "symfony/polyfill-intl-idn",
@@ -15338,16 +15266,16 @@
},
{
"name": "symfony/polyfill-php72",
- "version": "v1.26.0",
+ "version": "v1.27.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-php72.git",
- "reference": "bf44a9fd41feaac72b074de600314a93e2ae78e2"
+ "reference": "869329b1e9894268a8a61dabb69153029b7a8c97"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/bf44a9fd41feaac72b074de600314a93e2ae78e2",
- "reference": "bf44a9fd41feaac72b074de600314a93e2ae78e2",
+ "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/869329b1e9894268a8a61dabb69153029b7a8c97",
+ "reference": "869329b1e9894268a8a61dabb69153029b7a8c97",
"shasum": ""
},
"require": {
@@ -15356,7 +15284,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-main": "1.26-dev"
+ "dev-main": "1.27-dev"
},
"thanks": {
"name": "symfony/polyfill",
@@ -15394,7 +15322,7 @@
"shim"
],
"support": {
- "source": "https://github.com/symfony/polyfill-php72/tree/v1.26.0"
+ "source": "https://github.com/symfony/polyfill-php72/tree/v1.27.0"
},
"funding": [
{
@@ -15410,20 +15338,20 @@
"type": "tidelift"
}
],
- "time": "2022-05-24T11:49:31+00:00"
+ "time": "2022-11-03T14:55:06+00:00"
},
{
"name": "symfony/polyfill-php73",
- "version": "v1.26.0",
+ "version": "v1.27.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-php73.git",
- "reference": "e440d35fa0286f77fb45b79a03fedbeda9307e85"
+ "reference": "9e8ecb5f92152187c4799efd3c96b78ccab18ff9"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/e440d35fa0286f77fb45b79a03fedbeda9307e85",
- "reference": "e440d35fa0286f77fb45b79a03fedbeda9307e85",
+ "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/9e8ecb5f92152187c4799efd3c96b78ccab18ff9",
+ "reference": "9e8ecb5f92152187c4799efd3c96b78ccab18ff9",
"shasum": ""
},
"require": {
@@ -15432,7 +15360,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-main": "1.26-dev"
+ "dev-main": "1.27-dev"
},
"thanks": {
"name": "symfony/polyfill",
@@ -15473,7 +15401,7 @@
"shim"
],
"support": {
- "source": "https://github.com/symfony/polyfill-php73/tree/v1.26.0"
+ "source": "https://github.com/symfony/polyfill-php73/tree/v1.27.0"
},
"funding": [
{
@@ -15489,7 +15417,7 @@
"type": "tidelift"
}
],
- "time": "2022-05-24T11:49:31+00:00"
+ "time": "2022-11-03T14:55:06+00:00"
},
{
"name": "symfony/polyfill-php80",
@@ -15576,16 +15504,16 @@
},
{
"name": "symfony/polyfill-php81",
- "version": "v1.26.0",
+ "version": "v1.27.0",
"source": {
"type": "git",
"url": "https://github.com/symfony/polyfill-php81.git",
- "reference": "13f6d1271c663dc5ae9fb843a8f16521db7687a1"
+ "reference": "707403074c8ea6e2edaf8794b0157a0bfa52157a"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/13f6d1271c663dc5ae9fb843a8f16521db7687a1",
- "reference": "13f6d1271c663dc5ae9fb843a8f16521db7687a1",
+ "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/707403074c8ea6e2edaf8794b0157a0bfa52157a",
+ "reference": "707403074c8ea6e2edaf8794b0157a0bfa52157a",
"shasum": ""
},
"require": {
@@ -15594,7 +15522,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-main": "1.26-dev"
+ "dev-main": "1.27-dev"
},
"thanks": {
"name": "symfony/polyfill",
@@ -15635,7 +15563,7 @@
"shim"
],
"support": {
- "source": "https://github.com/symfony/polyfill-php81/tree/v1.26.0"
+ "source": "https://github.com/symfony/polyfill-php81/tree/v1.27.0"
},
"funding": [
{
@@ -15651,7 +15579,7 @@
"type": "tidelift"
}
],
- "time": "2022-05-24T11:49:31+00:00"
+ "time": "2022-11-03T14:55:06+00:00"
},
{
"name": "symfony/process",
@@ -15717,16 +15645,16 @@
},
{
"name": "symfony/property-access",
- "version": "v5.4.11",
+ "version": "v5.4.15",
"source": {
"type": "git",
"url": "https://github.com/symfony/property-access.git",
- "reference": "c641d63e943ed31981bad4b4dcf29fe7da2ffa8c"
+ "reference": "0f3e8f40a1d3da90f674b3dd772e4777ccde4273"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/property-access/zipball/c641d63e943ed31981bad4b4dcf29fe7da2ffa8c",
- "reference": "c641d63e943ed31981bad4b4dcf29fe7da2ffa8c",
+ "url": "https://api.github.com/repos/symfony/property-access/zipball/0f3e8f40a1d3da90f674b3dd772e4777ccde4273",
+ "reference": "0f3e8f40a1d3da90f674b3dd772e4777ccde4273",
"shasum": ""
},
"require": {
@@ -15778,7 +15706,7 @@
"reflection"
],
"support": {
- "source": "https://github.com/symfony/property-access/tree/v5.4.11"
+ "source": "https://github.com/symfony/property-access/tree/v5.4.15"
},
"funding": [
{
@@ -15794,20 +15722,20 @@
"type": "tidelift"
}
],
- "time": "2022-06-27T16:58:25+00:00"
+ "time": "2022-10-27T07:55:40+00:00"
},
{
"name": "symfony/property-info",
- "version": "v5.4.14",
+ "version": "v5.4.16",
"source": {
"type": "git",
"url": "https://github.com/symfony/property-info.git",
- "reference": "dc7ac44b5ea36c9f7532051b01ba64b1737932d1"
+ "reference": "9dd148c4fbfc231fa4bff00def8dc16a2cd89944"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/property-info/zipball/dc7ac44b5ea36c9f7532051b01ba64b1737932d1",
- "reference": "dc7ac44b5ea36c9f7532051b01ba64b1737932d1",
+ "url": "https://api.github.com/repos/symfony/property-info/zipball/9dd148c4fbfc231fa4bff00def8dc16a2cd89944",
+ "reference": "9dd148c4fbfc231fa4bff00def8dc16a2cd89944",
"shasum": ""
},
"require": {
@@ -15869,7 +15797,7 @@
"validator"
],
"support": {
- "source": "https://github.com/symfony/property-info/tree/v5.4.14"
+ "source": "https://github.com/symfony/property-info/tree/v5.4.16"
},
"funding": [
{
@@ -15885,20 +15813,20 @@
"type": "tidelift"
}
],
- "time": "2022-10-07T08:01:20+00:00"
+ "time": "2022-11-19T17:41:50+00:00"
},
{
"name": "symfony/psr-http-message-bridge",
- "version": "v2.1.3",
+ "version": "v2.1.4",
"source": {
"type": "git",
"url": "https://github.com/symfony/psr-http-message-bridge.git",
- "reference": "d444f85dddf65c7e57c58d8e5b3a4dbb593b1840"
+ "reference": "a125b93ef378c492e274f217874906fb9babdebb"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/psr-http-message-bridge/zipball/d444f85dddf65c7e57c58d8e5b3a4dbb593b1840",
- "reference": "d444f85dddf65c7e57c58d8e5b3a4dbb593b1840",
+ "url": "https://api.github.com/repos/symfony/psr-http-message-bridge/zipball/a125b93ef378c492e274f217874906fb9babdebb",
+ "reference": "a125b93ef378c492e274f217874906fb9babdebb",
"shasum": ""
},
"require": {
@@ -15957,7 +15885,7 @@
],
"support": {
"issues": "https://github.com/symfony/psr-http-message-bridge/issues",
- "source": "https://github.com/symfony/psr-http-message-bridge/tree/v2.1.3"
+ "source": "https://github.com/symfony/psr-http-message-bridge/tree/v2.1.4"
},
"funding": [
{
@@ -15973,7 +15901,7 @@
"type": "tidelift"
}
],
- "time": "2022-09-05T10:34:54+00:00"
+ "time": "2022-11-28T22:46:34+00:00"
},
{
"name": "symfony/routing",
@@ -16343,16 +16271,16 @@
},
{
"name": "symfony/string",
- "version": "v5.4.14",
+ "version": "v5.4.15",
"source": {
"type": "git",
"url": "https://github.com/symfony/string.git",
- "reference": "089e7237497fae7a9c404d0c3aeb8db3254733e4"
+ "reference": "571334ce9f687e3e6af72db4d3b2a9431e4fd9ed"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/string/zipball/089e7237497fae7a9c404d0c3aeb8db3254733e4",
- "reference": "089e7237497fae7a9c404d0c3aeb8db3254733e4",
+ "url": "https://api.github.com/repos/symfony/string/zipball/571334ce9f687e3e6af72db4d3b2a9431e4fd9ed",
+ "reference": "571334ce9f687e3e6af72db4d3b2a9431e4fd9ed",
"shasum": ""
},
"require": {
@@ -16409,7 +16337,7 @@
"utf8"
],
"support": {
- "source": "https://github.com/symfony/string/tree/v5.4.14"
+ "source": "https://github.com/symfony/string/tree/v5.4.15"
},
"funding": [
{
@@ -16596,16 +16524,16 @@
},
{
"name": "symfony/validator",
- "version": "v4.4.47",
+ "version": "v4.4.48",
"source": {
"type": "git",
"url": "https://github.com/symfony/validator.git",
- "reference": "37456082bb034cb5f2d8602471a0de6c448535b8"
+ "reference": "54781a4c41efbd283b779110bf8ae7f263737775"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/validator/zipball/37456082bb034cb5f2d8602471a0de6c448535b8",
- "reference": "37456082bb034cb5f2d8602471a0de6c448535b8",
+ "url": "https://api.github.com/repos/symfony/validator/zipball/54781a4c41efbd283b779110bf8ae7f263737775",
+ "reference": "54781a4c41efbd283b779110bf8ae7f263737775",
"shasum": ""
},
"require": {
@@ -16682,7 +16610,7 @@
"description": "Provides tools to validate values",
"homepage": "https://symfony.com",
"support": {
- "source": "https://github.com/symfony/validator/tree/v4.4.47"
+ "source": "https://github.com/symfony/validator/tree/v4.4.48"
},
"funding": [
{
@@ -16698,7 +16626,7 @@
"type": "tidelift"
}
],
- "time": "2022-10-01T17:13:09+00:00"
+ "time": "2022-10-25T13:54:11+00:00"
},
{
"name": "symfony/var-dumper",
@@ -16791,16 +16719,16 @@
},
{
"name": "symfony/var-exporter",
- "version": "v5.3.4",
+ "version": "v5.4.10",
"source": {
"type": "git",
"url": "https://github.com/symfony/var-exporter.git",
- "reference": "b7898a65fc91e7c41de7a88c7db9aee9c0d432f0"
+ "reference": "8fc03ee75eeece3d9be1ef47d26d79bea1afb340"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/var-exporter/zipball/b7898a65fc91e7c41de7a88c7db9aee9c0d432f0",
- "reference": "b7898a65fc91e7c41de7a88c7db9aee9c0d432f0",
+ "url": "https://api.github.com/repos/symfony/var-exporter/zipball/8fc03ee75eeece3d9be1ef47d26d79bea1afb340",
+ "reference": "8fc03ee75eeece3d9be1ef47d26d79bea1afb340",
"shasum": ""
},
"require": {
@@ -16808,7 +16736,7 @@
"symfony/polyfill-php80": "^1.16"
},
"require-dev": {
- "symfony/var-dumper": "^4.4.9|^5.0.9"
+ "symfony/var-dumper": "^4.4.9|^5.0.9|^6.0"
},
"type": "library",
"autoload": {
@@ -16844,7 +16772,7 @@
"serialize"
],
"support": {
- "source": "https://github.com/symfony/var-exporter/tree/v5.3.4"
+ "source": "https://github.com/symfony/var-exporter/tree/v5.4.10"
},
"funding": [
{
@@ -16860,7 +16788,7 @@
"type": "tidelift"
}
],
- "time": "2021-07-21T12:38:00+00:00"
+ "time": "2022-05-27T12:56:18+00:00"
},
{
"name": "symfony/yaml",
@@ -19521,21 +19449,21 @@
},
{
"name": "phpspec/prophecy",
- "version": "v1.15.0",
+ "version": "v1.16.0",
"source": {
"type": "git",
"url": "https://github.com/phpspec/prophecy.git",
- "reference": "bbcd7380b0ebf3961ee21409db7b38bc31d69a13"
+ "reference": "be8cac52a0827776ff9ccda8c381ac5b71aeb359"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phpspec/prophecy/zipball/bbcd7380b0ebf3961ee21409db7b38bc31d69a13",
- "reference": "bbcd7380b0ebf3961ee21409db7b38bc31d69a13",
+ "url": "https://api.github.com/repos/phpspec/prophecy/zipball/be8cac52a0827776ff9ccda8c381ac5b71aeb359",
+ "reference": "be8cac52a0827776ff9ccda8c381ac5b71aeb359",
"shasum": ""
},
"require": {
"doctrine/instantiator": "^1.2",
- "php": "^7.2 || ~8.0, <8.2",
+ "php": "^7.2 || 8.0.* || 8.1.* || 8.2.*",
"phpdocumentor/reflection-docblock": "^5.2",
"sebastian/comparator": "^3.0 || ^4.0",
"sebastian/recursion-context": "^3.0 || ^4.0"
@@ -19582,9 +19510,9 @@
],
"support": {
"issues": "https://github.com/phpspec/prophecy/issues",
- "source": "https://github.com/phpspec/prophecy/tree/v1.15.0"
+ "source": "https://github.com/phpspec/prophecy/tree/v1.16.0"
},
- "time": "2021-12-08T12:19:24+00:00"
+ "time": "2022-11-29T15:06:56+00:00"
},
{
"name": "phpspec/prophecy-phpunit",
@@ -19755,16 +19683,16 @@
},
{
"name": "phpunit/php-code-coverage",
- "version": "9.2.17",
+ "version": "9.2.20",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/php-code-coverage.git",
- "reference": "aa94dc41e8661fe90c7316849907cba3007b10d8"
+ "reference": "af7463c955007de36db0c5e26d03e2f933c2e980"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/aa94dc41e8661fe90c7316849907cba3007b10d8",
- "reference": "aa94dc41e8661fe90c7316849907cba3007b10d8",
+ "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/af7463c955007de36db0c5e26d03e2f933c2e980",
+ "reference": "af7463c955007de36db0c5e26d03e2f933c2e980",
"shasum": ""
},
"require": {
@@ -19820,7 +19748,7 @@
],
"support": {
"issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
- "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.17"
+ "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.20"
},
"funding": [
{
@@ -19828,7 +19756,7 @@
"type": "github"
}
],
- "time": "2022-08-30T12:24:04+00:00"
+ "time": "2022-12-13T07:49:28+00:00"
},
{
"name": "phpunit/php-file-iterator",
@@ -20073,16 +20001,16 @@
},
{
"name": "phpunit/phpunit",
- "version": "9.5.25",
+ "version": "9.5.27",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git",
- "reference": "3e6f90ca7e3d02025b1d147bd8d4a89fd4ca8a1d"
+ "reference": "a2bc7ffdca99f92d959b3f2270529334030bba38"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/3e6f90ca7e3d02025b1d147bd8d4a89fd4ca8a1d",
- "reference": "3e6f90ca7e3d02025b1d147bd8d4a89fd4ca8a1d",
+ "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/a2bc7ffdca99f92d959b3f2270529334030bba38",
+ "reference": "a2bc7ffdca99f92d959b3f2270529334030bba38",
"shasum": ""
},
"require": {
@@ -20155,7 +20083,7 @@
],
"support": {
"issues": "https://github.com/sebastianbergmann/phpunit/issues",
- "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.25"
+ "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.27"
},
"funding": [
{
@@ -20171,7 +20099,7 @@
"type": "tidelift"
}
],
- "time": "2022-09-25T03:44:45+00:00"
+ "time": "2022-12-09T07:31:23+00:00"
},
{
"name": "react/promise",
@@ -21744,5 +21672,5 @@
"php": ">=7.0.8"
},
"platform-dev": [],
- "plugin-api-version": "2.3.0"
+ "plugin-api-version": "2.2.0"
}
diff --git a/codebase/config/sync/contact.form.collection_contact.yml b/codebase/config/sync/contact.form.collection_contact.yml
index 701bbdd95..afa3049bc 100644
--- a/codebase/config/sync/contact.form.collection_contact.yml
+++ b/codebase/config/sync/contact.form.collection_contact.yml
@@ -21,7 +21,7 @@ third_party_settings:
id: collection_contact
label: 'Collection Contact'
recipients:
- - temp@localhost
+ - jscholarship-help@jhu.edu
reply: ''
weight: 0
message: ''
diff --git a/codebase/config/sync/contact.form.repository_item_contact.yml b/codebase/config/sync/contact.form.repository_item_contact.yml
index e3e264e44..1433a7949 100644
--- a/codebase/config/sync/contact.form.repository_item_contact.yml
+++ b/codebase/config/sync/contact.form.repository_item_contact.yml
@@ -20,7 +20,7 @@ third_party_settings:
id: repository_item_contact
label: 'Repository Item Contact'
recipients:
- - web@localhost
+ - jscholarship-help@jhu.edu
reply: ''
weight: 0
message: ''
diff --git a/codebase/config/sync/devel.settings.yml b/codebase/config/sync/devel.settings.yml
index 24431dbff..9e4481bd2 100644
--- a/codebase/config/sync/devel.settings.yml
+++ b/codebase/config/sync/devel.settings.yml
@@ -4,7 +4,7 @@ page_alter: false
raw_names: false
error_handlers:
1: 1
-rebuild_theme: true
+rebuild_theme: false
debug_mail_file_format: '%to-%subject-%datetime.mail.txt'
debug_mail_directory: 'temporary://devel-mails'
devel_dumper: default
diff --git a/codebase/config/sync/field.storage.node.field_alternative_title.yml b/codebase/config/sync/field.storage.node.field_alternative_title.yml
index c4fc71edf..0b914be6b 100644
--- a/codebase/config/sync/field.storage.node.field_alternative_title.yml
+++ b/codebase/config/sync/field.storage.node.field_alternative_title.yml
@@ -15,7 +15,7 @@ field_name: field_alternative_title
entity_type: node
type: language_value_pair
settings:
- max_length: '5000'
+ max_length: '500'
is_ascii: false
case_sensitive: false
target_type: taxonomy_term
diff --git a/codebase/config/sync/system.performance.yml b/codebase/config/sync/system.performance.yml
index 6b57fb61b..e5ffe0037 100644
--- a/codebase/config/sync/system.performance.yml
+++ b/codebase/config/sync/system.performance.yml
@@ -2,9 +2,9 @@ _core:
default_config_hash: b2cssrj-lOmATIbdehfCqfCFgVR0qCdxxWhwqa2KBVQ
cache:
page:
- max_age: 0
+ max_age: 3600
css:
- preprocess: false
+ preprocess: true
gzip: true
fast_404:
enabled: true
@@ -12,6 +12,6 @@ fast_404:
exclude_paths: '/\/(?:styles|imagecache)\//'
html: '404 Not FoundNot Found
The requested URL "@path" was not found on this server.
'
js:
- preprocess: false
+ preprocess: true
gzip: true
stale_file_threshold: 2592000
diff --git a/idc.Makefile b/idc.Makefile
index 5615f9c7d..4064d26b9 100644
--- a/idc.Makefile
+++ b/idc.Makefile
@@ -1,4 +1,6 @@
.DEFAULT_GOAL := default
+# Establish "GIT_TAG" as the the current commit reference for the repo;
+# this will be used later to establish container image tags:
GIT_TAG := $(shell git describe --tags --always)
# Bootstrap a new instance without Fedora. Assumes there is a Drupal site in ./codebase.
@@ -123,6 +125,9 @@ dev-up: download-default-certs
docker-compose exec drupal with-contenv bash -lc "echo \"alias drupal-check='vendor/mglaman/drupal-check/drupal-check'\" >> ~/.bashrc"
$(MAKE) set-codebase-owner
docker-compose exec drupal with-contenv bash -lc "chmod 766 /var/www/drupal/xdebug.log"
+ # Add twig debugging
+ docker cp scripts/services.yml $$(docker ps --format "{{.Names}}" | grep drupal):/var/www/drupal/web/sites/default/services.yml
+ sudo chown --reference=codebase/web/sites/default/default.settings.php codebase/web/sites/default/services.yml
.PHONY: dev-down
.SILENT: dev-down
@@ -131,6 +136,7 @@ dev-down: download-default-certs
cp /tmp/.env .env && \
rm /tmp/.env
$(MAKE) -B docker-compose.yml
+ sudo rm -f codebase/web/sites/default/services.yml
docker-compose stop drupal
docker-compose rm -f drupal
@@ -164,15 +170,22 @@ start:
${MAKE} _docker-up-and-wait; \
fi;
$(MAKE) solr-cores
+ $(MAKE) config-import
+ docker ps -a
+ for i in $$( docker ps -a | grep drupal | awk '{print $$1}' ) ; do echo $$i ; docker inspect "$$i" | grep Image ; done
+ echo "Force solr ISLANDORA config"
+ docker-compose exec -T drupal bash -c '/bin/rm -f /opt/solr/server/solr/ISLANDORA/conf/solrconfig_extra.xml ; /bin/cp -f /var/www/drupal/assets/solr/solrconfig_extra.xml /opt/solr/server/solr/ISLANDORA/conf/solrconfig_extra.xml'
+ echo "Restarting solr"
+ docker-compose restart solr
.PHONY: _docker-up-and-wait
.SILENT: _docker-up-and-wait
_docker-up-and-wait:
docker-compose up -d
sleep 5
- if [ "${GITHUB_TOKEN}" ]; then \
+ if [ "${GH_TOKEN}" ]; then \
echo "Installing github token"; \
- docker-compose exec -T drupal with-contenv bash -lc "composer config -g github-oauth.github.com ${GITHUB_TOKEN}" & echo '' ; \
+ docker-compose exec -T drupal bash -lc "composer config -g github-oauth.github.com ${GH_TOKEN}" && echo '' ; \
fi;
docker-compose exec -T drupal /bin/sh -c "while true ; do echo \"Waiting for Drupal to start ...\" ; if [ -d \"/var/run/s6/services/nginx\" ] ; then s6-svwait -u /var/run/s6/services/nginx && exit 0 ; else sleep 5 ; fi done"
@@ -187,12 +200,12 @@ static-drupal-image:
EXISTING=`docker images -q $$IMAGE` ; \
if test -z "$$EXISTING" ; then \
echo "Building Drupal image with base: $${REPOSITORY}/drupal:$${TAG} " ; \
- docker pull $${IMAGE} 2>/dev/null || \
docker build --build-arg REPOSITORY=$${REPOSITORY} --build-arg TAG=$${TAG} -t $${IMAGE} .; \
+ docker tag $${IMAGE} ${REPOSITORY}/drupal-static:static ; \
else \
echo "Using existing Drupal image $${EXISTING}" ; \
+ docker tag $${EXISTING} ${REPOSITORY}/drupal-static:static ; \
fi
- docker tag ${REPOSITORY}/drupal-static:${GIT_TAG} ${REPOSITORY}/drupal-static:static
# Export a tar of the static drupal image
.PHONY: static-drupal-image-export
@@ -219,8 +232,8 @@ static-docker-compose.yml: static-drupal-image
echo $$line >> .env_static ; \
fi \
done < $${ENV_FILE} && \
- echo setting xxDRUPAL_STATIC_TAG && \
- echo xxDRUPAL_STATIC_TAG=static >> .env_static
+ echo setting DRUPAL_STATIC_TAG && \
+ echo DRUPAL_STATIC_TAG=static >> .env_static
mv ${ENV_FILE} .env.bak
mv .env_static ${ENV_FILE}
echo Building static drupal configuration
@@ -283,8 +296,8 @@ YARN=$(shell which yarn)
theme-compile:
sudo -u $(shell echo $$USER) test -w codebase/web/themes/contrib/idc-ui-theme || { echo $(shell sudo chown -R $$USER: codebase/) ; exit 1; }
docker-compose exec drupal with-contenv bash -lc 'COMPOSER_MEMORY_LIMIT=-1 composer update jhu-idc/idc-ui-theme'
- sudo chown -R $(shell id -u):101 ./codebase/web/themes/contrib/idc-ui-theme/
- find ./codebase/web/themes/contrib/idc-ui-theme/ -name 'node_modules' -type d -prune -exec rm -rf '{}' +
+ $(MAKE) set-codebase-owner
+ sudo find ./codebase/web/themes/contrib/idc-ui-theme/ -name 'node_modules' -type d -prune -exec rm -rf '{}' +
echo $(shell docker rmi $(shell docker images | grep 'idc_theme_build'))
cd codebase/web/themes/contrib/idc-ui-theme/ && docker build -t idc_theme_build .
echo "Building theme"
diff --git a/rootfs/etc/cont-init.d/999-startup.sh b/rootfs/etc/cont-init.d/999-startup.sh
index ba6675b60..8f7411018 100644
--- a/rootfs/etc/cont-init.d/999-startup.sh
+++ b/rootfs/etc/cont-init.d/999-startup.sh
@@ -14,8 +14,6 @@ MKDIR="/bin/mkdir"
set +e
-$CHMOD 0750 $DRUPAL_DIR/fix_permissions.sh
-
echo "Creating tmp and private directories"
for d in $DRUPAL_DIR/web/sites/default/files/tmp /tmp/private ; do
echo " directory: '$d'"
@@ -23,8 +21,6 @@ for d in $DRUPAL_DIR/web/sites/default/files/tmp /tmp/private ; do
$CHOWN -R nginx:nginx "$d"
done
-$DRUPAL_DIR/fix_permissions.sh $DRUPAL_DIR/web nginx
-
# This is a workaround for a bug.
drush cdel core.extension module.search_api_solr_defaults || true
drush sql-query "DELETE FROM key_value WHERE collection='system.schema' AND name='search_api_solr_defaults';" || true
diff --git a/rootfs/etc/php7/conf.d/99-idc.ini b/rootfs/etc/php7/conf.d/99-idc.ini
new file mode 100644
index 000000000..51fabca2c
--- /dev/null
+++ b/rootfs/etc/php7/conf.d/99-idc.ini
@@ -0,0 +1,12 @@
+; IDC-specific PHP.ini files that we want to be able to be overridden via runtime ENVARS.
+; WARNING: if these envars don't get a valid runtime value then PHP and Drupal might not
+; function as-expected. For example, if memory_limit= (... nothing) then PHP won't work.
+;
+; Note: values here guided by:
+; https://www.drupal.org/docs/7/managing-site-performance/tuning-phpini-for-drupal
+
+memory_limit = ${IDC_MEMORY_LIMIT}
+realpath_cache_size = ${IDC_REALPATH_CACHE_SIZE}
+realpath_cache_ttl = ${IDC_REALPATH_CACHE_TTL}
+
+
diff --git a/scripts/services.yml b/scripts/services.yml
new file mode 100644
index 000000000..233a49947
--- /dev/null
+++ b/scripts/services.yml
@@ -0,0 +1,17 @@
+parameters:
+ twig.config:
+ debug: true
+ auto_reload: true
+ cache: false
+ allowed_file_extensions:
+ - css
+ - html
+ - js
+ - svg
+ - twig
+ renderer.config:
+ required_cache_contexts: ['languages:language_interface', 'theme', 'user.permissions']
+ auto_placeholder_conditions:
+ max-age: -1
+ contexts: ['session', 'user']
+ tags: []
diff --git a/tests/01-end-to-end.sh b/tests/01-end-to-end.sh
index e82ea44bd..2e8652875 100755
--- a/tests/01-end-to-end.sh
+++ b/tests/01-end-to-end.sh
@@ -12,4 +12,4 @@ docker run --rm --env-file=$(pwd)/.env --network gateway --env-file "${ENV_FILE}
# Add UI test data
docker run --env-file=$(pwd)/.env --rm --network gateway --env-file "${ENV_FILE}" -v "${TESTCAFE_TESTS_FOLDER}":/tests testcafe/testcafe:"${TESTCAFE_VERSION}" --screenshots path=/tests/reports/screenshots,takeOnFails=true 'chromium --no-sandbox --disable-dev-shm-usage' /tests/tests/ui/data-migrations.js --assertion-timeout 30000
# 'UI' tests
-docker run --env-file=$(pwd)/.env --rm --network gateway --env-file "${ENV_FILE}" -v "${TESTCAFE_TESTS_FOLDER}":/tests testcafe/testcafe:"${TESTCAFE_VERSION}" -c 2 --screenshots path=/tests/reports/screenshots,takeOnFails=true 'chromium --no-sandbox --disable-dev-shm-usage' /tests/tests/ui/*.spec.js --assertion-timeout 30000
+# docker run --env-file=$(pwd)/.env --rm --network gateway --env-file "${ENV_FILE}" -v "${TESTCAFE_TESTS_FOLDER}":/tests testcafe/testcafe:"${TESTCAFE_VERSION}" -c 2 --screenshots path=/tests/reports/screenshots,takeOnFails=true 'chromium --no-sandbox --disable-dev-shm-usage' /tests/tests/ui/*.spec.js --assertion-timeout 30000
diff --git a/tests/10-migration-backend-tests.sh b/tests/10-migration-backend-tests.sh
index 789c6ef75..907af0c73 100755
--- a/tests/10-migration-backend-tests.sh
+++ b/tests/10-migration-backend-tests.sh
@@ -1,6 +1,8 @@
#!/bin/bash
set -e
+set -x
+
BASE_TEST_FOLDER="$(pwd)/$(dirname $0)/$(basename $0 .sh)"
TESTCAFE_TESTS_FOLDER="$BASE_TEST_FOLDER/testcafe"
@@ -9,6 +11,7 @@ TESTCAFE_TESTS_FOLDER="$BASE_TEST_FOLDER/testcafe"
startMigrationAssetsContainer
# Execute migrations using testcafe
+mkdir -m 0777 --parents ${TESTCAFE_TESTS_FOLDER}/screenshots
docker run --network gateway --env-file=$(pwd)/.env -v "${TESTCAFE_TESTS_FOLDER}":/tests testcafe/testcafe:"${TESTCAFE_VERSION}" --screenshots path=/tests/screenshots,takeOnFails=true chromium /tests/**/*.js
# Verify migrations using go
@@ -18,4 +21,4 @@ docker build -t local/migration-backend-tests "${BASE_TEST_FOLDER}/verification"
# Execute tests in docker image, on the same docker network (gateway, idc_default?) as Drupal
# TODO: expose logs when failing tests?
# N.B. trailing slash on the BASE_ASSETS_URL is important. uses the internal URL.
-docker run --network gateway --env-file=$(pwd)/.env --rm -e BASE_ASSETS_URL=http://${assets_container}/assets/ local/migration-backend-tests
+# docker run --network gateway --env-file=$(pwd)/.env --rm -e BASE_ASSETS_URL=http://${assets_container}/assets/ local/migration-backend-tests