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

Complete Update for Drupal 9 1.0.0-RC3 #146

Merged
merged 68 commits into from
Nov 30, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
68 commits
Select commit Hold shift + click to select a range
38971b4
Display Entity updates
alliomeria Nov 3, 2021
1e010ef
Map view - alternate display if empty
alliomeria Nov 3, 2021
cd15fe9
Additional Digital Object types & mappings
alliomeria Nov 3, 2021
ccec3c7
Update Action menu for Content page
alliomeria Nov 3, 2021
f8cc37c
Update Action menu on My Content page
alliomeria Nov 3, 2021
dbe8552
Updates to default webforms
alliomeria Nov 3, 2021
69fdb04
Updates to Linked Data metadata display
alliomeria Nov 3, 2021
a8d7e98
Spelling correction for Collection
alliomeria Nov 3, 2021
43e4a90
Spelling correction for Collection
alliomeria Nov 3, 2021
34a4b90
Switch from Bookreader to Open Seadragon for Page item type
alliomeria Nov 3, 2021
8de044e
Update docker-compose-linux.yml
DiegoPino Nov 22, 2021
b6dd281
Update docker-compose-osx.yml
DiegoPino Nov 22, 2021
316bd8f
Update docker-compose-legacy.yml
DiegoPino Nov 22, 2021
fcf232d
New D9 Settings
DiegoPino Nov 22, 2021
e67aa9d
restore jsonapi_earlyrendering_workaround
DiegoPino Nov 22, 2021
83120c8
Another pass on settings
DiegoPino Nov 23, 2021
a6790ec
Last pass on theme and update lock
DiegoPino Nov 23, 2021
39c2459
Merge branch 'ISSUE-140b' into ISSUE-140b
alliomeria Nov 24, 2021
174d5ad
Merge pull request #1 from esmero/ISSUE-140b
alliomeria Nov 24, 2021
97c1ec6
Add color changes and fav icon
DiegoPino Nov 24, 2021
eb4e6d1
Updates on settings for final push
DiegoPino Nov 24, 2021
5c2dc32
Merge branch 'ISSUE-140b' of https://github.com/esmero/archipelago-de…
DiegoPino Nov 24, 2021
9843a51
Update ami_ingest_json.twig.html
alliomeria Nov 24, 2021
6f02b25
Update object_metadata_abstract_search_results.twig.html
alliomeria Nov 24, 2021
2e28fdc
Update object_description.twig.html
alliomeria Nov 24, 2021
6ff2b0a
Update ami_ingest_json.twig.html
alliomeria Nov 24, 2021
f3ed3ec
Update webform.webform.descriptive_metadata.yml
alliomeria Nov 24, 2021
9f6678d
Merge pull request #145 from alliomeria/ISSUE-140b
DiegoPino Nov 24, 2021
1b3e5c0
Tiny updates on colors and sync with base stuff
DiegoPino Nov 25, 2021
a669259
Update composer.lock
DiegoPino Nov 25, 2021
2a507d6
add 3 new menus
DiegoPino Nov 25, 2021
68967a0
Update settings, disable menus remove non used Theme
DiegoPino Nov 25, 2021
f57434e
Remove colors
DiegoPino Nov 25, 2021
12563c3
Last change on cached colors
DiegoPino Nov 25, 2021
19ae445
Rename all Static files templates to match titles on live options
DiegoPino Nov 25, 2021
1458502
Updates all ingested Metadata entities to the current RC3 versions
DiegoPino Nov 26, 2021
0c575b4
Update docs link from welcome Block and add new menus to deploy.sh
DiegoPino Nov 26, 2021
99bbb3d
Update OCR highlight and README
DiegoPino Nov 26, 2021
79a963f
New CSV from Allison
DiegoPino Nov 26, 2021
ce8d2cf
Update on the CSV to make the beautiful book Mirador based
DiegoPino Nov 26, 2021
76fe819
AMI JSON was missing a few mappings
DiegoPino Nov 26, 2021
1dbe131
small reformat
DiegoPino Nov 26, 2021
f099350
Never ending. Drupal 9 and its damn jquery deprecation
DiegoPino Nov 28, 2021
5dd81ee
Update many configs again. Just to be sure
DiegoPino Nov 28, 2021
dce08a3
Missing configs, colors (of course) and a new S3fs setting
DiegoPino Nov 29, 2021
dc1f885
Some initial docs updates.
Nov 29, 2021
7fb799c
Run Only on books and articles
DiegoPino Nov 29, 2021
14a6277
Update object_metadata_abstract_for_search_search_results.twig.html
alliomeria Nov 29, 2021
5a9831d
Update metadatadisplay_entity_08.json
DiegoPino Nov 29, 2021
dda6c54
Update ami_set_entity_01.csv
alliomeria Nov 29, 2021
8dc0893
Change Cantaloupe UID:GID back and add docker-compose pull as extra p…
Nov 29, 2021
903ebc0
Fix broken internal link in ubuntu.md
Nov 29, 2021
eb8cced
just some small text edits
Nov 29, 2021
4f00341
just some formatting edits
Nov 29, 2021
a012c7c
Merge remote-tracking branch 'upstream/ISSUE-140b' into ISSUE-147
Nov 29, 2021
6a93bdc
Add note about user contributed video
Nov 29, 2021
af998fc
Adds M1/Arm64 docker-compose.yml
DiegoPino Nov 29, 2021
5bbc1ef
Merge branch 'ISSUE-140b' of https://github.com/esmero/archipelago-de…
DiegoPino Nov 29, 2021
8f62757
Merge pull request #148 from aksm/ISSUE-147
DiegoPino Nov 29, 2021
12fccaf
Mariadb does not allow bin log expire
DiegoPino Nov 29, 2021
924074b
Update ami_set_entity_01.csv
alliomeria Nov 29, 2021
df1cf39
Update object_metadata_abstract_for_search_search_results.twig.html
alliomeria Nov 29, 2021
60dce3b
Merge pull request #149 from esmero/alliomeria-tiny-patch-ISSUE-140b
DiegoPino Nov 29, 2021
bda57e3
Merge pull request #150 from esmero/alliomeria-tiny-patch-ISSUE-140b
DiegoPino Nov 29, 2021
19f48f3
Encoded Object Description Search Abstract
DiegoPino Nov 29, 2021
1ae67b5
Updates OSX for Intel and M1
DiegoPino Nov 29, 2021
b0ee2ff
Create upgradeFromD8ToD9.md
DiegoPino Nov 30, 2021
56355a1
Update on theme for webform navigation bar (black thing)
DiegoPino Nov 30, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 17 additions & 15 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,26 +1,27 @@
# Archipelago Docker Deployment for Drupal 9

**Updated:** May 16th 2021
**Updated:** November 25th 2021

This repository serves as bootstrap for a Archipelago 1.0.0-RC2 deployment via Docker using and provides this time many more options:
This repository serves as bootstrap for a Archipelago 1.0.0-RC3 deployment via Docker using and provides this time many more options:

- minio.io (latest) S3/Azure/Local/Remote alternative and also Gateway to many others.
- Apache Solr 8.8.2 (or 7.5 if you go legacy) with the wizardly Solr OCR Highlight library [v0.5](https://github.com/dbmdz/solr-ocrhighlighting/releases/tag/0.5.0) build by the Developement Team at the [Bavarian State Library](https://github.com/dbmdz). Thanks Johannes Baiter!
- Mysql 8.0.22 (or Mysql 5.7 if you go legacy)
- Ngnix 11
- Custom PHP FPM 7.4 zuper-tunned for Drupal 8/9 (or 7.3 FPM if you go legacy) with WARC to WACZ processing and Composer 2.0
- minio.io (latest) S3/Azure/Local/Remote alternative with a new Console and also Gateway to many others.
- Apache Solr 8.8.2 (or 7.5 if you go legacy) with the wizardly Solr OCR Highlight library [v0.7.1](https://github.com/dbmdz/solr-ocrhighlighting/releases/tag/0.7.1) build by the Developement Team at the [Bavarian State Library](https://github.com/dbmdz). Thanks Johannes Baiter!
- MySQL 8.0.22 (or MySQL 5.7 if you go legacy)
- NGINX 11
- Custom PHP FPM 7.4 zuper-tunned for Drupal 8/9 with multi-arch (so M1 too) capabilities (or 7.3 FPM if you go legacy) with WARC to WACZ processing and Composer 2.0
- Natural Language Processing via NPLWEB64
- Cantaloupe 4.1.9 as IIIF Server with Video Frame extraction and PDF support
- A Skeleton Project setup to run latest Version of Drupal (9.1.8) and strawberryfield modules & friends on 1.0.0-RC2
- Official *Drupal 9 ready* release again. D9.1 this time. Drupal 8 has its own branch to avoid cluttering this one too much. Look for 1.0.0-RC2
- A Skeleton Project setup to run latest Version of Drupal (9.2.9) and Strawberry Field modules on 1.0.0-RC3 & friends on 0.2.0
- Official *Drupal 9 ready* release again. D9.2.9 this time. Drupal 8 is no longer maintained, and we have documented the upgrade path
- Complete support for Apple Silicon *M1* Machines and in general arm64 architecture Chips like Raspberry Pi 4, with specially built arm64 docker containers. Blazing fast OCR!

The skeleton project contains all the pieces needed to run a local deployment of a vanilla Archipelago including (*YES*!) content provided as optional feature from [archipelago-recyclables](https://github.com/esmero/archipelago-recyclables)

# Starting from CERO

This is the recommended, simplest way for this release. There are a too many, tons of fun new features, Metadata Displays, viewers, bug fixes (yes), webform elements and improvements! We include now W3C WebAnnotations capabilities provided by the great team behind https://recogito.github.io/annotorious/api-docs/osd-plugin/ (thanks Rainer Simon) and with complete integration in our UI and metadata backends. Also [WACZ! and replay.web](https://github.com/webrecorder/replayweb.page) both fabulous developments by the Webrecorder team (thanks Ilya Kreymer and Emma Dickson). There is more. Release will have a full feature list. Promised.
This is the recommended, simplest way for this release. There are a too many, tons of fun new features, Metadata Displays, viewers, new JS libraries, better HUGE import capabilities, bug fixes (yes), webform elements and improvements! W3C WebAnnotations capabilities are even better now by the great team behind https://recogito.github.io/annotorious/api-docs/osd-plugin/ (thanks Rainer Simon) and with complete integration in our UI and metadata backends. Also [WACZ! and replay.web](https://github.com/webrecorder/replayweb.page) both fabulous developments by the Webrecorder team (thanks Ilya Kreymer and Emma Dickson). There is more. Release will have a full feature list. Promised.

## OSX:
## OSX Intel or Apple Silicon M1:

[Step by Step deployment on OSX](docs/osx.md)

Expand All @@ -31,11 +32,11 @@ This is the recommended, simplest way for this release. There are a too many, to
## More fun if you add content:
[One-Step Demo content ingest](docs/democontent.md)

## 1.0.0-RC2
## 1.0.0-RC3

We have been working hard on 1.0.0-RC2 and we may have delayed this a little more than expected. As you may have read (or heard) we take Release Candidates seriously and wanted to advance core features before closing the cycle. There are many bug fixes, improvements, AMI, invisible and visible workflow changes, smarter processing, and most important all made to allow you to extend Archipelago even more. We ship now with a lot more Site Building (fancy word for settings views, field formatters, Solr, etc in Drupal)to make starting with Archipelago or becoming a permanent resident of your own group of always sunny islands fun.
We have been working hard on 1.0.0-RC3 and it took us again 6 months from the latest releas to reach this point. RC3 is different. There won't be any more Release Candidates and this leads directly, in a time span of 2-3 weeks into 1.0.0. From there on 1.1.0, etc. You already know we take Release Candidates seriously and this one brings a huge list of new features, improvements and migration tools, finally closing the cycle. There are many bug fixes, requested needs, improvements, AMI with remote import and LoD reconciliation, invisible and visible workflow changes, smarter processing, and most important all made to allow you to extend Archipelago even more. We ship now with a lot more Site Building (fancy word for settings views, field formatters, Solr, etc in Drupal) to make starting with Archipelago or becoming a permanent resident of your own group of always sunny islands fun.

You get (yet) again fresh, strange, bizarre, unusual and/or amazing features that were not even asked for! We still work hard to not deviate from our own roadmap, keeping the North Star always visible while navigating these stormy waters, to make UI/UX clearer to understand, code less redundant and easier to follow, to cover (so close) every Media/and LoD base we could wish for. This Archipelago feels like a beach day everyday we use it and manages from time to time produce wonderful surprises. It is our little tiny secret garden/pumpkin/working-bee/undiscovered-magical-islands and we are happy we see it as our own home. A child with grown-up Repository responsabilities, a planned and consistent Architecture Implementation (and still a novell one, cute, cozy and simple) that can cover, mix and match GLAM, IR, Data and Scientific/Research/Museum Tech/Education needs, metadata and media in any shape.
You get (yet) again fresh, strange, bizarre, unusual and/or amazing features that were not even asked for! We still work hard to not deviate from our own roadmap, keeping the North Star always visible while navigating these stormy waters, to make UI/UX clearer to understand, code less redundant and easier to follow, to cover (so close) every Media/and LoD base we could wish for. This Archipelago feels like a Sunny beach day with friends and Samba everyday we use it and manages from time to time produce wonderful surprises. It is our little tiny secret garden/pumpkin/working-bee/undiscovered-magical-islands and we are happy we see it as our own home or at least a place you will keep coming back. A child with grown-up Repository responsabilities, a planned and consistent Architecture Implementation (and still a novell one, cute, cozy and simple) that can cover, mix and match GLAM, IR, Data and Scientific/Research/Museum Tech/Education needs, metadata and media in any shape.

Ambitions never end to be enorm (we try to be humble) and we are always a bit quite tired (same as with Beta1, Beta2, Beta3 and RC1). Who knew we could write so much code and deploy and test over and over? We know the Horizon is still far away and we may never end sailing towards it.

Expand All @@ -48,8 +49,9 @@ If you like it or not, want new features or want to part of making this better,
## Caring & Coding + Fixing + Testing

* [Diego Pino](https://github.com/DiegoPino)
* [Giancarlo Birello](https://github.com/giancarlobi)
* [Allison Lund](https://github.com/alliomeria)
* [Giancarlo Birello](https://github.com/giancarlobi)
* [Albert Min](https://github.com/aksm)

## Acknowledgments

Expand Down
36 changes: 27 additions & 9 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@
{
"type": "composer",
"url": "https://packages.drupal.org/8"
},
{
"type": "composer",
"url": "https://asset-packagist.org"
}
],
"require": {
Expand All @@ -21,6 +25,8 @@
"archipelago/archipelago_subtheme": "dev-1.0.0-RC3",
"aws/aws-php-sns-message-validator": "^1.5",
"aws/aws-sdk-php": "^3.63",
"behat/mink": "^1.8",
"behat/mink-selenium2-driver": "^1",
"composer/installers": "^1.9",
"composer/semver": "^3.2",
"cweagans/composer-patches": "^1.6",
Expand All @@ -38,7 +44,7 @@
"drupal/devel": "4.x-dev@dev",
"drupal/display_field_copy": "^2.0",
"drupal/ds": "^3.9",
"drupal/facets": "1.x-dev",
"drupal/facets": "2.0.x-dev@dev",
"drupal/fancy_file_delete": "^2.0",
"drupal/field_permissions": "^1.0@RC",
"drupal/file_mdm": "^2",
Expand All @@ -50,18 +56,20 @@
"drupal/imce": "^1.7",
"drupal/inline_entity_form": "1.x-dev",
"drupal/jquery_ui_datepicker": "^1.1",
"drupal/jquery_ui_slider": "^1.1",
"drupal/jsonapi_earlyrendering_workaround": "^1.0",
"drupal/moderated_content_bulk_publish": "^1.0",
"drupal/pathauto": "^1.6",
"drupal/queue_ui": "^2.0",
"drupal/quick_node_clone": "^1.12",
"drupal/restui": "^1.16",
"drupal/role_based_theme_switcher": "^9",
"drupal/role_theme_switcher": "^1.1",
"drupal/s3fs": "3.x-dev",
"drupal/schema_metatag": "^1.3",
"drupal/search_api": "1.19.0",
"drupal/search_api": "^1.21",
"drupal/search_api_attachments": "^1.0@beta",
"drupal/search_api_autocomplete": "^1.2",
"drupal/search_api_solr": "^4.1.4",
"drupal/search_api_solr": "^4.2",
"drupal/smtp": "^1.0",
"drupal/tokenuuid": "^1.2",
"drupal/twig_field": "^1.0",
Expand All @@ -79,6 +87,8 @@
"mixnode/mixnode-warcreader-php": "^0.0.6",
"ml/json-ld": "^1.0",
"mtdowling/jmespath.php": "^2.4",
"npm-asset/nouislider": "^14",
"oomphinc/composer-installers-extender": "^2.0",
"pear/archive_tar": "^1.4.12",
"ramsey/uuid": "^4.1",
"react/child-process": "^0.6.1",
Expand All @@ -100,8 +110,6 @@
"zaporylie/composer-drupal-optimizations": "^1.1.1"
},
"require-dev": {
"behat/mink": "1.8.x-dev",
"behat/mink-selenium2-driver": "1.4.x-dev",
"drupal/core-dev": "^9",
"mglaman/drupal-check": "^1.1"
},
Expand Down Expand Up @@ -142,12 +150,18 @@
"web-root": "web/"
}
},
"installer-types": [
"npm-asset",
"bower-asset"
],
"installer-paths": {
"web/core": [
"type:drupal-core"
],
"web/libraries/{$name}": [
"type:drupal-library"
"type:drupal-library",
"type:npm-asset",
"type:bower-asset"
],
"web/modules/contrib/{$name}": [
"type:drupal-module"
Expand All @@ -163,6 +177,10 @@
]
},
"enable-patching": true,
"patches": null
"patches": {
"drupal/facets": {
"Fix deprecated JQUERY UI Slider": "https://www.drupal.org/files/issues/2021-11-12/issue-3153622-nouislider_25.patch"
}
}
}
}
}
Loading