Upgrade to jammy64 and PHP 8.1

Vagrantfile

@@ -11,8 +11,8 @@ $memory = ENV.fetch("ISLANDORA_VAGRANT_MEMORY", "4096")
 $hostname = ENV.fetch("ISLANDORA_VAGRANT_HOSTNAME", "islandora8")
 $virtualBoxDescription = ENV.fetch("ISLANDORA_VAGRANT_VIRTUALBOXDESCRIPTION", "Islandora 8")
 
-# The Vagrant Base Box to use. Currently works with 'ubuntu/focal64'.
-$vagrantBox = ENV.fetch("ISLANDORA_DISTRO", "ubuntu/focal64")
+# The Vagrant Base Box to use. Currently works with 'ubuntu/jammy64'.
+$vagrantBox = ENV.fetch("ISLANDORA_DISTRO", "ubuntu/jammy64")
 
 # See the "install profile" section of the README for the full gamut available.
 $drupalProfile = ENV.fetch("ISLANDORA_INSTALL_PROFILE", "starter")

crayfish.yml

@@ -3,9 +3,6 @@
 - hosts: crayfish
   become: yes
 
-  vars:
-    php_version: "7.4"
-
   roles:
     - name: geerlingguy.repo-remi
       when: "ansible_os_family == 'RedHat' and islandora_build_box|bool == True"
@@ -14,6 +11,8 @@
       when: islandora_build_base_box|bool == True
     - name: geerlingguy.php
       when: islandora_build_base_box|bool == True
+    - name: geerlingguy.php-mysql
+      when: islandora_build_base_box|bool == True
     - name: geerlingguy.git
       when: islandora_build_base_box|bool == True
     - name: geerlingguy.composer

inventory/vagrant/group_vars/all/main.yml

@@ -39,6 +39,9 @@ mysql_users:
 # Used by both the webserver and crayfish role for CentOS.
 php_enablerepo: "remi-php72"
 php_packages_state: "latest"
+# This is the PHP version installed
+# Changing this requires you to build a new base box.
+php_version: "8.1"
 
 # Log4j 
 os_environment:

inventory/vagrant/group_vars/tomcat.yml

@@ -7,7 +7,7 @@ tomcat9_users:
       - manager-gui
 
 # For Fedora 5
-# Use "file-simple", for test instance 
+# Use "file-simple", for test instance
 # For production use either "jdbc-mysql" or "jdbc-postgresql"
 #fcrepo_persistence: file-simple
 
@@ -59,7 +59,7 @@ fcrepo_syn_tokens:
       - fedoraAdmin
     token: "{{ islandora_syn_token }}"
 
-fcrepo_version: "6.0.0"
+fcrepo_version: "6.3.0"
 fcrepo_home_dir: "/opt/fcrepo"
 fcrepo_data_dir: "{{ fcrepo_home_dir }}/data"
 fcrepo_auth_header_name: "X-Islandora"
@@ -84,4 +84,4 @@ cantaloupe_create_FilesystemCache_dir: yes
 cantaloupe_resolver_static: HttpSource
 cantaloupe_HttpResolver_BasicLookupStrategy_url_prefix: ""
 cantaloupe_processor_selection_strategy: ManualSelectionStrategy
-cantaloupe_StreamProcessor_retrieval_strategy: CacheStrategy
+cantaloupe_StreamProcessor_retrieval_strategy: CacheStrategy

requirements.yml

@@ -1,5 +1,5 @@
 - src: geerlingguy.php-mysql
-  version: 2.0.1
+  version: 2.1.0
 
 - src: geerlingguy.repo-epel
   version: 1.2.4
@@ -8,13 +8,13 @@
   version: 1.2.0
 
 - src: geerlingguy.apache
-  version: 3.0.0
+  version: 3.3.0
 
 - src: geerlingguy.php-versions
-  version: 4.0.0
+  version: 5.0.0
 
 - src: geerlingguy.php
-  version: 4.0.0
+  version: 4.8.0
 
 - src: geerlingguy.composer
   version: 1.9.2
@@ -29,10 +29,10 @@
   version: 1.4.3
 
 - src: geerlingguy.solr
-  version: 5.3.0
+  version: 5.4.1
 
 - src: geerlingguy.java
-  version: 1.10.0
+  version: 2.2.0
 
 - src: geerlingguy.drupal
   version: 4.3.0

roles/internal/Islandora-Devops.crayfish/defaults/main.yml

@@ -69,10 +69,6 @@ crayfish_milliner_is_fedora_6: true
 # crayfish_packages:
 #   - ImageMagick
 
-php_packages_extra:
-  - php7.0-mysql
-  - php7.0-pgsql
-
 # homarus
 crayfish_homarus_log_file: /var/log/islandora/homarus.log
 crayfish_homarus_log_level: DEBUG

roles/internal/Islandora-Devops.crayfish/tasks/install.yml

@@ -1,10 +1,5 @@
 ---
 
-- name: Add ImageMagick repo (apt)
-  apt_repository:
-    repo: 'ppa:lyrasis/imagemagick-jp2'
-  when: ansible_os_family == "Debian"
-
 - name: Install epel repository
   yum:
     name: epel-release
@@ -57,23 +52,6 @@
   become_user: "{{ crayfish_user }}"
   become: true
 
-- name: "Get symfony/flex version"
-  composer:
-    command: show
-    working_dir: "{{ crayfish_install_dir }}/Houdini"
-    arguments: symfony/flex
-  changed_when: true
-  register: flex_package_info
-  ignore_errors: true
-  become: true
-  become_user: "{{ crayfish_user }}"
-
-- name: "Delete Houdini vendor folder to update symfony/flex"
-  file:
-    state: absent
-    path: "{{ crayfish_install_dir }}/Houdini/vendor"
-  when: "'versions : * v1.13.3' in flex_package_info.stdout"
-
 - name: Build crayfish code including dependencies
   composer:
     command: install

roles/internal/Islandora-Devops.crayfish/vars/Debian.yml

@@ -14,4 +14,3 @@ __crayfish_packages:
   - tesseract-ocr-srp
   - ffmpeg
   - poppler-utils
-__crayfish_db: mysql

roles/internal/Islandora-Devops.crayfish/vars/RedHat.yml

@@ -15,4 +15,3 @@ __crayfish_packages:
   - tesseract-langpack-srp
   - ffmpeg
   - poppler-utils
-__crayfish_db: mysql

vars/Debian.yml

@@ -3,8 +3,9 @@
 grok_version_tag: v3.1.0
 
 php_packages_extra:
-  - libapache2-mod-php7.4
-  - php7.4-mysql
-  - php7.4-pgsql
-  - php7.4-gd
+  - "libapache2-mod-php{{ php_version }}"
+  - "php{{ php_version }}-mysql"
+  - "php{{ php_version }}-pgsql"
+  - "php{{ php_version }}-gd"
+  - "php{{ php_version }}-xml"
 

webserver.yml

@@ -3,9 +3,6 @@
 - hosts: webserver
   become: yes
 
-  vars:
-    php_version: "7.4"
-
   environment:
     COMPOSER_MEMORY_LIMIT: -1
 
@@ -25,6 +22,7 @@
     - name: geerlingguy.composer
       when: islandora_build_base_box|bool == True
     - name: geerlingguy.drush  # Include drush as drupal-openseadragon needs it.
+      when: islandora_build_base_box|bool == False
 
     - name: geerlingguy.drupal
       when: islandora_build_base_box|bool == False