diff --git a/distillery/provision.sh b/distillery/provision.sh index ecff763..d2aca74 100755 --- a/distillery/provision.sh +++ b/distillery/provision.sh @@ -99,7 +99,7 @@ docker-compose run --rm barrel /bin/bash -c "sudo PATH=\$PATH -u www-data /bin/b \"${MYSQL_DATABASE}\" \"${MYSQL_USER}\" \"${MYSQL_PASSWORD}\" \ \"${GRAPHDB_REPO}\" \"${GRAPHDB_USER}\" \"${GRAPHDB_PASSWORD}\" \ \"${DRUPAL_USER}\" \"${DRUPAL_PASS}\" \ - \"${USE_DRUPAL_9}\"" + \"${USE_DRUPAL_8}\"" log_info " => Starting container" diff --git a/distillery/resources/compose/barrel/scripts/provision_container.sh b/distillery/resources/compose/barrel/scripts/provision_container.sh index 523f55d..d42e674 100644 --- a/distillery/resources/compose/barrel/scripts/provision_container.sh +++ b/distillery/resources/compose/barrel/scripts/provision_container.sh @@ -40,8 +40,8 @@ DRUPAL_PASS="$2" echo "DRUPAL_PASS=$DRUPAL_PASS" shift 2 -USE_DRUPAL_9="$1" -echo "USE_DRUPAL_9=$USE_DRUPAL_9" +USE_DRUPAL_8="$1" +echo "USE_DRUPAL_8=$USE_DRUPAL_8" shift 1 log_info " => Preparing installation environment" @@ -60,10 +60,10 @@ function drupal_sites_permission_workaround() { # Create a new composer project. log_info " => Creating composer project" -if [ -z "${USE_DRUPAL_9}" ]; then - composer create-project 'drupal/recommended-project:^8.9.0' . -else +if [ -z "${USE_DRUPAL_8}" ]; then composer create-project 'drupal/recommended-project:^9.0.0' . +else + composer create-project 'drupal/recommended-project:^8.9.0' . fi # Install drush so that we can automate a lot of things @@ -87,7 +87,7 @@ log_info " => Installing Wisski packages" cd "$COMPOSER_DIR" # install the development version when requested -if [ -z "${USE_DRUPAL_9}" ]; then +if [ -z "${USE_DRUPAL_8}" ]; then composer require 'drupal/wisski' else composer require 'drupal/wisski:2.x-dev' diff --git a/distillery/utils/wisski_2x_3x.sh b/distillery/utils/wisski_2x_3x.sh new file mode 100644 index 0000000..f66424a --- /dev/null +++ b/distillery/utils/wisski_2x_3x.sh @@ -0,0 +1,15 @@ +#!/bin/bash + +chmod 777 web/sites/default +chmod 666 web/sites/default/*settings.php +chmod 666 web/sites/default/*services.yml + +composer require 'drupal/core-recommended:^9' 'drupal/core-composer-scaffold:^9' 'drupal/core-project-message:^9' --update-with-dependencies --no-update +composer update +composer require 'drupal/wisski' + +drush updatedb + +chmod 755 web/sites/default +chmod 644 web/sites/default/*settings.php +chmod 644 web/sites/default/*services.yml \ No newline at end of file