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

Add flags for specific drupal and wisski versions

Browse source
This commit is contained in:
Tom Wiesing 2022-03-08 13:07:05 +01:00
parent 59ea9538e4
commit 0ef02f4e7d
No known key found for this signature in database
GPG key ID: DC1F29F2BC78AB15
2 changed files with 11 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_8}\"" \"${DRUPAL_VERSION}\" \"${WISSKI_VERSION}\""
log_info " => Starting container" log_info " => Starting container"

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

@ -40,8 +40,12 @@ DRUPAL_PASS="$2"
echo "DRUPAL_PASS=$DRUPAL_PASS" echo "DRUPAL_PASS=$DRUPAL_PASS"
shift 2 shift 2
USE_DRUPAL_8="$1" DRUPAL_VERSION="$1"
echo "USE_DRUPAL_8=$USE_DRUPAL_8" echo "DRUPAL_VERSION=$DRUPAL_VERSION"
shift 1
WISSKI_VERSION="$1"
echo "WISSKI_VERSION=$WISSKI_VERSION"
shift 1 shift 1
log_info " => Preparing installation environment" log_info " => Preparing installation environment"
@ -60,10 +64,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_8}" ]; then if [ -z "${DRUPAL_VERSION}" ]; then
composer create-project 'drupal/recommended-project:^9.0.0' . composer create-project 'drupal/recommended-project:^9.0.0' .
else else
composer create-project 'drupal/recommended-project:^8.9.0' . composer create-project "drupal/recommended-project:$DRUPAL_VERSION" .
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,10 +91,10 @@ 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_8}" ]; then if [ -z "${WISSKI_VERSION}" ]; then
composer require 'drupal/wisski' composer require 'drupal/wisski'
else else
composer require 'drupal/wisski:2.x-dev' composer require "drupal/wisski:$WISSKI_VERSION"
fi fi
# Install dependencies of WissKI # Install dependencies of WissKI