stack/drupal: fixup, add mysql binaries

stack/drupal/buildout.cfg

@@ -8,6 +8,7 @@ extends =
 
 parts +=
   instance
+  composer-bin
   install-drupal
 
 [apache-php]
@@ -24,6 +25,10 @@ url = ${:_profile_base_location_}/${:filename}
 [custom-application-deployment]
 db-name = drupal_db
 db-user = drupal
+publish-list =
+  admin-username
+  admin-password
+  nextjs-url
 
 [create-next-app]
 recipe = plone.recipe.command
@@ -46,19 +51,19 @@ stop-on-error = true
 recipe = slapos.recipe.cmmi
 path = ${application:location}
 configure-command = true
-#  ${composer-bin:output} config vendor-dir docroot/vendor
 make-targets =
 make-options =
 make-binary =
-  ${composer-bin:output} install
+  composer install
 #  ${composer-bin:output} update
-  ${composer-bin:output} require drupal/next
+  composer require drupal/next
+  composer require --dev phpunit/phpunit
 post-install =
   mkdir -p drush/config
   cp ${pathauto.pattern.article.yml:target} drush/config/
 environment =
   COMPOSER_HOME=@@LOCATION@@
-  PATH=${apache-php:location}/bin:%(PATH)s
+  PATH=${composer:location}/bin:${apache-php:location}/bin:%(PATH)s
 
 [template-drupal-instance]
 <= drupal-download

stack/drupal/buildout.hash.cfg

@@ -4,7 +4,7 @@ md5sum = 158282e578bf9416f5e0e524496b9f68
 
 [template-drupal-instance]
 filename = drupal-instance.cfg.in
-md5sum = cb6606a18968396236699876e55d6269
+md5sum = e78f8c1bf06be85554b1455422722703
 
 [template-settings.php]
 filename = default.settings.php.in

stack/drupal/drupal-instance.cfg.in

@@ -59,9 +59,25 @@ wrapper-path = ${directory:bin}/composer
 [blt-bin]
 recipe = slapos.cookbook:wrapper
 command-line =
-  ${php-bin:wrapper-path} ${directory:www}/vendor/vendor/bin/blt
+  ${php-bin:wrapper-path} ${directory:www}/vendor/bin/blt
 wrapper-path = ${directory:bin}/blt
 
+[phpunit-bin]
+recipe = slapos.cookbook:wrapper
+command-line =
+  ${php-bin:wrapper-path} ${directory:www}/vendor/bin/phpunit
+wrapper-path = ${directory:bin}/phpunit
+
+[mysql-bin]
+recipe = slapos.cookbook:wrapper
+command-line = "{{ mariadb_location }}/bin/mysql"
+wrapper-path = ${directory:bin}/mysql
+
+[mysqldump-bin]
+recipe = slapos.cookbook:wrapper
+command-line = "{{ mariadb_location }}/bin/mysqldump"
+wrapper-path = ${directory:bin}/mysqldump
+
 [env-base]
 recipe = collective.recipe.template
 input = inline:
@@ -193,6 +209,10 @@ depends =
   ${settings.local.php:recipe}
   ${composer-bin:recipe}
   ${drush-bin:recipe}
+  ${phpunit-bin:recipe}
+  ${blt-bin:recipe}
+  ${mysql-bin:recipe}
+  ${mysqldump-bin:recipe}
 
 [drupal-admin-passwd]
 recipe = slapos.cookbook:generate.password