From 969330f70f3355df5d8c0312385996444ef3e1ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?benjamin=20melan=C3=A7on?= Date: Fri, 26 Jun 2020 08:38:36 -0400 Subject: [PATCH] Make steps more complete --- creating-new-drutopia-site.md | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/creating-new-drutopia-site.md b/creating-new-drutopia-site.md index 3f53c4d..8c92daf 100644 --- a/creating-new-drutopia-site.md +++ b/creating-new-drutopia-site.md @@ -31,7 +31,7 @@ Commands for copying throughout will assume this above setup. Ordinarily this will live under https://gitlab.com/agaric/sites (for Agaric clients) or https://gitlab.com/drutopia-platform/sites (for direct Drutopia platform members). -Copy the composer.json used by the appropriate build source, such as the [default build source for the Drutopia Platform](https://gitlab.com/drutopia-platform/build_source). +Copy the `composer.json`, `composer.lock`, and `.gitignore` files used by the appropriate build source, such as the [default build source for the Drutopia Platform](https://gitlab.com/drutopia-platform/build_source). Replace "example" below with name of the site, usually derived from the main domain name, for instance `example-com`: @@ -45,8 +45,11 @@ Once you have created and are in this directory, whether `agaric/sites` or `drut ``` wget https://gitlab.com/drutopia-platform/build_source/-/raw/master/composer.json +wget https://gitlab.com/drutopia-platform/build_source/-/raw/master/composer.lock wget https://gitlab.com/drutopia-platform/build_source/-/raw/master/.gitignore ddev config --docroot=web --project-type=drupal8 --webserver-type=apache-fpm --mariadb-version=10.1 --php-version=7.3 --xdebug-enabled=true --use-dns-when-possible=false +ddev start +ddev composer install ``` ```note @@ -112,3 +115,26 @@ ddev . drush -y sql-drop ddev . drush -y sql-sync @live @self ddev . drush -y rsync @live:%files @self:%files ``` + +And get the latest code for your distribution (here presuming [build_source](https://gitlab.com/drutopia-platform/build_source/)) like this: + +``` +wget https://gitlab.com/drutopia-platform/build_source/-/raw/master/composer.lock +ddev composer install +``` + +Or update the build source yourself, if you've got it downloaded locally per [overall setup](#overall-setup) above: + +``` +ddev composer update +cp composer.json ~/Projects/drutopia-platform/build_source/ +cp composer.lock ~/Projects/drutopia-platform/build_source/ +cd ~/Projects/drutopia-platform/build_source/ +git add -p composer.json +# Make certain no changes to `composer.json` that shouldn't be shared by every site +git commit -m "Add x module or patch for z" +git add -p composer.lock +git commit -m "Update composer lock file" +git push +cd - +```