diff --git a/distillery/provision.sh b/distillery/provision.sh index d2aca74..2e872eb 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_8}\"" + \"${DRUPAL_VERSION}\" \"${WISSKI_VERSION}\"" 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 d42e674..2fc14ef 100644 --- a/distillery/resources/compose/barrel/scripts/provision_container.sh +++ b/distillery/resources/compose/barrel/scripts/provision_container.sh @@ -40,8 +40,12 @@ DRUPAL_PASS="$2" echo "DRUPAL_PASS=$DRUPAL_PASS" shift 2 -USE_DRUPAL_8="$1" -echo "USE_DRUPAL_8=$USE_DRUPAL_8" +DRUPAL_VERSION="$1" +echo "DRUPAL_VERSION=$DRUPAL_VERSION" +shift 1 + +WISSKI_VERSION="$1" +echo "WISSKI_VERSION=$WISSKI_VERSION" shift 1 log_info " => Preparing installation environment" @@ -60,10 +64,10 @@ function drupal_sites_permission_workaround() { # Create a new composer project. log_info " => Creating composer project" -if [ -z "${USE_DRUPAL_8}" ]; then +if [ -z "${DRUPAL_VERSION}" ]; then composer create-project 'drupal/recommended-project:^9.0.0' . else - composer create-project 'drupal/recommended-project:^8.9.0' . + composer create-project "drupal/recommended-project:$DRUPAL_VERSION" . fi # Install drush so that we can automate a lot of things @@ -87,10 +91,10 @@ log_info " => Installing Wisski packages" cd "$COMPOSER_DIR" # install the development version when requested -if [ -z "${USE_DRUPAL_8}" ]; then +if [ -z "${WISSKI_VERSION}" ]; then composer require 'drupal/wisski' else - composer require 'drupal/wisski:2.x-dev' + composer require "drupal/wisski:$WISSKI_VERSION" fi # Install dependencies of WissKI