Merge branch 'develop' into staging

Author: andriyun

.docksal/commands/db/ballerup

@@ -27,19 +27,14 @@ DRUPAL_ROOT=/var/www/ballerup.bellcom.dk/web/sites/default
 DRUSH="drush"
 
 echo-yellow "Copying db dump from server"
-## @TODO This command only for development phase.
-ssh $SSH_CRED "cd ${DRUPAL_ROOT} && drush sql-dump | gzip -9 > ~/${DB_NAME}.sql.gz"
-scp $SSH_CRED:$DB_NAME* ./
-## To use after release.
-#scp $SSH_CRED:/var/lib/mysql_backup/$DB_NAME* ./
+scp $SSH_CRED:/var/lib/mysql_backup/$DB_NAME* ./
 
 echo-yellow "Dropping existing local db"
 fin exec "${DRUSH} sql-drop -y"
 
 echo-yellow "Loading downloaded db dump"
 fin exec "zcat < ${DB_NAME}.sql.gz | ${DRUSH} sqlc"
-## To use after release.
-#fin exec "zcat < ${DB_NAME}-cache-structure.sql.gz | ${DRUSH} sqlc"
+fin exec "zcat < ${DB_NAME}-cache-structure.sql.gz | ${DRUSH} sqlc"
 
 echo-yellow "Removing db dump"
 fin exec "rm ${DB_NAME}.sql.gz"

.docksal/docksal.env

@@ -1,4 +1,4 @@
 DOCKSAL_STACK=default
 DOCROOT=web
-COMPOSER_DEFAULT_VERSION="1"
-CLI_IMAGE="docksal/cli:2.11-php7.4"
+COMPOSER_DEFAULT_VERSION="2"
+CLI_IMAGE="docksal/cli:2.12-php7.4"

composer.json

@@ -49,9 +49,10 @@
         "drupal/ckeditor_iframe": "^2.1",
         "drupal/coder": "^8.3",
         "drupal/console": "^1.0.2",
-        "drupal/core": "^8.8.0",
-        "drupal/core-composer-scaffold": "^8.8.0",
+        "drupal/core": "^8.9",
+        "drupal/core-composer-scaffold": "^8.9",
         "drupal/fancy_file_delete": "^2.0",
+        "drupal/file_management": "^1.0@alpha",
         "drupal/gin": "^3.0",
         "drupal/gin_login": "^1.0@RC",
         "drupal/memcache": "^2.2",
@@ -78,7 +79,7 @@
         "os2web/os2web_news": "dev-master",
         "os2web/os2web_pagebuilder": "dev-master",
         "os2web/os2web_person_information": "dev-master",
-        "os2web/os2web_rest_api": "^0.0.1",
+        "os2web/os2web_rest_api": "0.*",
         "os2web/os2web_search": "dev-master",
         "os2web/os2web_spotbox": "dev-master",
         "vlucas/phpdotenv": "^4.0",