rnsrk/wisski-cloud-distillery
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use drupal 9 / wisski 3 by default

Browse source
This commit is contained in:
Tom Wiesing 2021-12-06 11:50:47 +01:00
parent 279d683c3b
commit 760e41b415
No known key found for this signature in database
GPG key ID: DC1F29F2BC78AB15
3 changed files with 22 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
distillery/provision.sh
View file

@ -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}\" \ \"${MYSQL_DATABASE}\" \"${MYSQL_USER}\" \"${MYSQL_PASSWORD}\" \
\"${GRAPHDB_REPO}\" \"${GRAPHDB_USER}\" \"${GRAPHDB_PASSWORD}\" \ \"${GRAPHDB_REPO}\" \"${GRAPHDB_USER}\" \"${GRAPHDB_PASSWORD}\" \
\"${DRUPAL_USER}\" \"${DRUPAL_PASS}\" \ \"${DRUPAL_USER}\" \"${DRUPAL_PASS}\" \
\"${USE_DRUPAL_9}\"" \"${USE_DRUPAL_8}\""
log_info " => Starting container" log_info " => Starting container"

12
distillery/resources/compose/barrel/scripts/provision_container.sh
View file

@ -40,8 +40,8 @@ DRUPAL_PASS="$2"
echo "DRUPAL_PASS=$DRUPAL_PASS" echo "DRUPAL_PASS=$DRUPAL_PASS"
shift 2 shift 2
USE_DRUPAL_9="$1" USE_DRUPAL_8="$1"
echo "USE_DRUPAL_9=$USE_DRUPAL_9" echo "USE_DRUPAL_8=$USE_DRUPAL_8"
shift 1 shift 1
log_info " => Preparing installation environment" log_info " => Preparing installation environment"
@ -60,10 +60,10 @@ function drupal_sites_permission_workaround() {
# Create a new composer project. # Create a new composer project.
log_info " => Creating composer project" log_info " => Creating composer project"
if [ -z "${USE_DRUPAL_9}" ]; then if [ -z "${USE_DRUPAL_8}" ]; then
composer create-project 'drupal/recommended-project:^8.9.0' .
else
composer create-project 'drupal/recommended-project:^9.0.0' . composer create-project 'drupal/recommended-project:^9.0.0' .
else
composer create-project 'drupal/recommended-project:^8.9.0' .
fi fi
# Install drush so that we can automate a lot of things # Install drush so that we can automate a lot of things
@ -87,7 +87,7 @@ log_info " => Installing Wisski packages"
cd "$COMPOSER_DIR" cd "$COMPOSER_DIR"
# install the development version when requested # install the development version when requested
if [ -z "${USE_DRUPAL_9}" ]; then if [ -z "${USE_DRUPAL_8}" ]; then
composer require 'drupal/wisski' composer require 'drupal/wisski'
else else
composer require 'drupal/wisski:2.x-dev' composer require 'drupal/wisski:2.x-dev'

15
distillery/utils/wisski_2x_3x.sh Normal file
View file

@ -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