diff --git a/cmd/ddev/cmd/dotddev_assets/commands/web/README.txt b/cmd/ddev/cmd/dotddev_assets/commands/web/README.txt index 24df00e8ef0..e0c4a052de3 100644 --- a/cmd/ddev/cmd/dotddev_assets/commands/web/README.txt +++ b/cmd/ddev/cmd/dotddev_assets/commands/web/README.txt @@ -1,7 +1,4 @@ #ddev-generated -Scripts in this directory will be executed inside the web -container. You can copy the example file or just rename it: -`mv drush.example drush`, for example, and it will become -a live command. +Scripts in this directory will be executed inside the web container. See https://ddev.readthedocs.io/en/stable/users/extend/custom-commands/#environment-variables-provided for a list of environment variables that can be used in the scripts. diff --git a/cmd/ddev/cmd/dotddev_assets/commands/web/drush.example b/cmd/ddev/cmd/dotddev_assets/commands/web/drush.example deleted file mode 100755 index 4998b5744a6..00000000000 --- a/cmd/ddev/cmd/dotddev_assets/commands/web/drush.example +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/bash - -## #ddev-generated -## Description: Run drush inside the web container -## Usage: drush [flags] [args] -## Example: "ddev drush uli" or "ddev drush sql-cli" or "ddev drush --version" - -drush $@ - -# To use the site-installed drush directly (rather than running /usr/local/bin/drush), -# you might want to execute it directly: -# -# /var/www/html/vendor/bin/drush $@ diff --git a/cmd/ddev/cmd/dotddev_assets/commands/web/reload-nginx.example b/cmd/ddev/cmd/dotddev_assets/commands/web/reload-nginx.example deleted file mode 100755 index f70cc97eef8..00000000000 --- a/cmd/ddev/cmd/dotddev_assets/commands/web/reload-nginx.example +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash - -## #ddev-generated -## Description: Reload config for nginx and php-fpm inside web container -## Usage: restart-nginx -## Example: "ddev restart-nginx" - -killall -HUP nginx php-fpm diff --git a/cmd/ddev/cmd/global_dotddev_assets/commands/web/README.txt b/cmd/ddev/cmd/global_dotddev_assets/commands/web/README.txt index 24df00e8ef0..70ccf715bfa 100644 --- a/cmd/ddev/cmd/global_dotddev_assets/commands/web/README.txt +++ b/cmd/ddev/cmd/global_dotddev_assets/commands/web/README.txt @@ -1,7 +1,7 @@ #ddev-generated Scripts in this directory will be executed inside the web container. You can copy the example file or just rename it: -`mv drush.example drush`, for example, and it will become +`mv reload-nginx.example reload-nginx`, for example, and "ddev reload-nginx" will become a live command. See https://ddev.readthedocs.io/en/stable/users/extend/custom-commands/#environment-variables-provided for a list of environment variables that can be used in the scripts. diff --git a/cmd/ddev/cmd/global_dotddev_assets/commands/web/drush b/cmd/ddev/cmd/global_dotddev_assets/commands/web/drush index ffb10ce6794..88e09bb235c 100755 --- a/cmd/ddev/cmd/global_dotddev_assets/commands/web/drush +++ b/cmd/ddev/cmd/global_dotddev_assets/commands/web/drush @@ -6,4 +6,8 @@ ## Example: "ddev drush uli" or "ddev drush sql-cli" or "ddev drush --version" ## ProjectTypes: drupal7,drupal8,drupal9,backdrop +if ! command -v drush >/dev/null; then + echo "drush is not available. You may need to 'ddev composer require drush/drush'" + exit 1 +fi drush "$@" diff --git a/cmd/ddev/cmd/packrd/packed-packr.go b/cmd/ddev/cmd/packrd/packed-packr.go index de35eaee8f7..bc528346a51 100644 --- a/cmd/ddev/cmd/packrd/packed-packr.go +++ b/cmd/ddev/cmd/packrd/packed-packr.go @@ -18,12 +18,13 @@ var _ = func() error { "02a6f9085bf494232da6cee02cead9d3": "1f8b08000000000000ffb454ef6fe23618fe9ebfe2a9a1bd15d5cd75df16d49d98604725681157365514552e718875891dd9ced10ef2bf4f4e428f706da5695b3e45ef8fc77e9ef7f5d33af21f85f41f99893dafd5422b0cf937bae2926b667918e02ac2b3cab166d2c22af05058301942ad256c2c0c2291f033689eaa6fbc8a2442f27307d6e766a94566859201462c97cb180c8f5aad0dd7580b1bc3c61ccb5c6b2e2d8cb0dcb5cd0c5bf10049d530cf988d1798d36c4b691667e9330b53215d24dd529a3291c46ab5708d83279666090f401c8b1a8040e946007e09e06b9e296d8d6f2cb3b9f1b338fbb1348b33212375ee92678894c66438193ff71c40b392ba823113c950ad0e3229f1bcdf67a3d16c3aba6c6ffafdc11f0f93e9d5b837bd7b984d478537bcbd9d7cb924c41311e6f8b1e238f0fd4e814b90d8dacc102cba4e3789aad1ea9c771109cf5bc722e108ba089507f72d99e1686f2e025a40c82ae63e1a6fe9fda72da5314fb2d3ef71f79958ad1f5cbc19e64fc23623ddee1e6073384dc89216696fcaeb16c41179e1d08404b0138ab437f5ef7130ff487f59748a6027cd7032beebf5c757d70f939be96d411a203c31fc5fa296177d0d3b12ef48b0b78dff2fff71ef6a34bcf9fc5f92df41fe13e67bd4e969f3c41606ce2222b024812a0dc09c1fae99880e16ea5173f6f51d813f750e5635d342da081ffeec4daf03cce457e95ca93a0f3f8995549a87a7018ecdbdfc00d2be20f8f5e4e7b74fe81cd080b3b088e5892d5f52806b855469bea37406a3aa5b43e5d6f175769628959dbfc98c1bb6aca5ab250895e45ef5f6a9747be29e2bc1022f1be272f3f21d0717058e2e417c82c55ec16b332e7ce2a8395f7835ddde5c14a4ebb97c79f611e85f3bf3e90f7e9b7d76a6b1bfa5b5daa40640bbfeb997042727a541e0638957d9cecd97dbbbc9a0f29d44c8fc89ae645e4df0295c51957189efd7f15e864142a6d742927ada6fd7ad85ec900eb620a97936bb7a6399b6af3494c2ff1d0000ffffffcabbe0ef060000", "08efec459d444bc9eb8bf32159d4a2e3": "1f8b08000000000000ff5c8eb18e83300c86f73c858fdc8ad8996eb8be40a54e88c11037584a1d141bdac7af4287565dbfefb3f5fb9f6e62e926d4c539efc187407b1b49a8a051a8e89f742ebc1a67e9e1bc091c49e29d80453910d84270a709e62c862c54ead94531520f47375c13461d61c01275acf6f4c0db9aa887a67e7b55b8d9d2402e9f2cb11a281be9b769db9d8a7296c6b9f7a2df3ff70c0000ffff176c8cedd3000000", "0fc82d64f8cf13ea52a9080a2fc16752": "1f8b08000000000000ff4c90416ec3400845f73e0552d6f6ec7b8d5c2078f889516d8806ecc6b7af2691aaee40bc8fe05d44708c0f181a2764b8d6a6cf0c52a35c3448b4a1a6b7937e745d6906e185ba2784bc23a0c5238779cfde9c54d928f91b040e5dcf4fcd35d5ad07aa5bb21a5ad07cd21e6a8fe1d64f78afbd4dc3700568c97cc657297d3035b0e402f11a937a8195489e57943dd0a2e0953029758ff46dacbe6d6c12e5023bb4b96db01c0f6eda23313e9b1f2a10ba7b23a65523c9eff40fa63f9872e17c3f3483f6807ca480e2e3681a7e030000ffffb77ce1973d010000", - "14c63bd11eb5c6e19c764e5ac5649a59": "1f8b08000000000000ff4c90b18ee3300c447b7fc5006963abcf6fa4ba2eb23439f36049064939c9df1fe2dd2cb614f4861cbe53cedcc7bfacd4e8ccc335a96c6e900a5fc4904599bce90b0f5957cc049f4cdd9921d52413be100fce436ad5a354ea843fad23c58ad4b6d7f1cf672cdb4adc65259ae25f3787b2c642885f865bd991b5db327dc8e3753be3def4933e23d60cf14f93d40a8788557622b55262cdd3305c492cee9b5d4278df362963f685b9259ba405d6601ee795a11bd5029fce9a43eae6ad8cdf732c9c5877d1560bab8f7b5479476cdcb4ed92998f5eefdde66877fc82f103c397e8878799e876183b6cd897e369f81f0000ffffa67d0e417d010000", + "14c63bd11eb5c6e19c764e5ac5649a59": "1f8b08000000000000ff4ccf416e83400c85e13da77852d630fb5e232718c62fc51278906d487afb8a54aab2ff2d7fef26c273fca6d16b52867b73dd33a0865c3420ea6cd9fd074f5d57cc045f6c4752a0162a442ec493335ab7ac6af46918ee2496cc3dbe4ab91e4cce2ab9507a8b497ba195c83aaf2c47d0a3f0953429ed88ecdbd8fab655932837daa9de6da3e57856d7eb24c6ddfba942c1a33b2a568d447fe023c67f8c5c6aa255bbe847bcd96f72fc0d9d86df000000ffff234b7d3c02010000", "21a0484a6d087670e7959f77db252ecd": "1f8b08000000000000ff3c8e314fc4300c46f7fc8a8f2b23e5f66e483d892d150556e426e61244132bf10115e2bfa3dcd0cd7acf965f77735c623a2e5483315d87ce7bfeeacf9cb890b26f68e4ea4a148d390db0c209d3e3346b2e2bbea3066860b84b299c1452f2073b6d672f95ce3c4082d4b6dbd0e98756f9e40187f665570763768758b192b3735f855d7c8fee0ecb45c1543768067912bd0e69839d4d6e3d3ded49f72482dbdf713cbdbe3d4cd393b5cf7fe63f0000ffff18fb6254e5000000", "2b68e0f364c73b04830e2be4056637ca": "1f8b08000000000000ff6c8d414b03311085effb2b9e5d614fa1f71541c58207c143150fa5d0c966cc06d22426b3d5823f5ed25ad883a761e6bdef9bf66aa95d586a2a63d3b42d5a63f8a02c07ce246ceae991cb905d1217438f3c05ec8fe5d363f08e83c005188d210621173857e0ad90e5feafb6f9f064cb161bcab66c6bbcfaa67df2dc63517f9d6b0bc43cdfa1a61ca340a53ace290f6344b77e7a79c7ebfdc3f36a7dd3e107334795efe60e65484853e1db7fa43b589682639c20113232ba53abc385c297931127246577709e2d97a6b9b88c864a46e3faaef90d0000ffff35d34ed246010000", "3680182c262a9957e45fefd42fac49c5": "1f8b08000000000000ff448ebb4ec43010457b7fc5c5a18db64f85041448142b04a2586de1d88333c8d8d68c13c3df23575b9ffb38d3dd69e57c5a9d6ec64c139e48bd706d5cf282b73de3b348380ba9e2f1f5059c9503a16d844e2b7cc9cd712619d50f759116f48acb577251afb838897a1decf9d7fdd4440b6c08748c8c2f423848944bb628722335ed91f3b86a2e25ec4a326be7e637ce11f3ec7ce3c335b263f82ce59b7c7bffaba40b7a915087ac31bdc2de3f58f31f0000ffffa04dc3b7e1000000", "36a16b6b6dedc9b09ade15b72f6da34c": "1f8b08000000000000ffb491cf8adb3c14c5d7d1539c4f3624fe68ea66661793ae3a8b3e40a15086a044d78ea823b992ec06e2bc7bd19f0e64680b5d349bc857bf7bcf3d47c57ff541e9fa20dc89b1a24021254deb8e3459e14986d2077247ab06af8cdee2498b434f301652b978bc483a8c5d003f39d1d1361760f46cda76a6d830677af676a4b915bda3d979e147171a9f2ee23cf4b4050fea7900c74a522bc6de433970a379f5e60e80695bfebaa45f57920a674cb5f882b2c09abee11d9ed1c09f4833206db8cf3e00ba28cf5ac558aaec27b24e19bd2b57c369c07a9dbf31437cff8a65fd39094d35ae8355daa37cbc2d2bc68ec211ca0d541041c8239a4f72155bdceb2e9a862d4260299c9c57c516f974c72553150392c8f57ed55bd29c1effafa274c27f1ab058d2f164a0b4da77e4573c35bf3d1b49bc6a9678785f4b9a6a3df67dea8fd1f1f29ae6dc3876e0f98d9e5f620c3f4b6eecfd2e4fccc94a1e6fa977f46b2c3bcc5cabe25fd304070f7fe5c0d2d978da27d960e5f7eb6ffef5ea79f13ff21124278e8c2da2a132e1f191039087c43bfe514fa25712c276e399b4dfa2dcbccc89537e040000ffff9f9b34c9cd030000", "3a64652d196409b117a6642982703e11": "1f8b08000000000000ff6c90bd4ec43010847b3fc520d717f7a9a1a53a6ab48937c94ace6eb09d08de1ed987740ded37339f7ffc4b9844c3446573ce7bf818f9baadac9ca9726ce895cb9ce5a8623ae24e925037c64ea228963292adadf65168e5b1a34a921a7afba6fd483ca2499f89f3b86f52c08f18f9d402d12291bbba5b67d34aa29c07e7f16eb5455451db30f3d72999cb03855d6b68277ccea68bac9818bb9ddaaf0fd16aff58411a610b663b73f973ffd8898d2e063d7bce4369e7d8e78373ed01b82d0876d4d058289c2fce21d95a3a18da7ffc060000ffff43ac368957010000", + "3d17d9b1e811ea02f7f3f998dccb0eaf": "1f8b08000000000000ff548d3d0ec2300c46f79cc23473d4bd33488c08a907701b27b5489dc889a0c747415d58dff7f3ec655c58c605eb668cb560bda7b78b24a4d8c87774a5ba2a97c659267852cae861cd123842c80a12590e40f150b6e242d981a5b227f8d0d27b0d5948fbd15c31d2044ab5a136f71b767e3b702f892618bafc3f1f8c79714a9812b8fbfc386da7c97c030000ffff80a84502be000000", "413082224d141b25ab8047dbbb46a60f": "1f8b08000000000000ff5c52bb72dc300cecf9153be72699b1a422dd7d441aa7cf50e49ec558243404a8dce5eb3394e2bc4a2c41601f788a91fbf0cac2ea8dd1bd849a3653a4025b9222a6ca60521ff89ed61533c13b433346a4a22912b6102a6b75418af95458f121dd900cbc27357d86dc10a455e5c7115ffad0a4f8d6d4e00b78f7795bf9ece6d6eb078acf8c50d63d0522f882c5ef84ff87892d0892b32f5147e73e8b751ade30e5625357f43548b9a557e4be6626b2b472723639187faa71d87cb5c7fb2a774cf550f3e587c79ade783a70384144096fac4390bc8972ec8ac787cfebd53900d8656d997a3d0a60803d365e71995389975f20a0d26ae8f0f807335f5f69575cfe277f71cebd9058cc36bd4ec7d358e9a32d8c12744c32b14c6a7e5e393565d58977638953686a9287778fa627963d552999c586ddd7d4bfe8b055d95364c44d2aba66b51ed65fcdf8dd7c1adcf39889a6879767f6e7c58cee67000000ffffe2b3906c4b020000", "4753795b9a57fb973233eb16c0036470": "1f8b08000000000000ff5c8f3d4fc3400c86f7fb1526e90003ead02d2c2040622342614088c1b9737346892f3a3bfdf8f728112da8ab1ffb7d5e9757eb9665dda246e7ca106877db915046a3e04a68222ba0ea3490824534b04860c7316dfca0e0d330a004d873df434bc0b2f055fdd0bcdc016fe7c18e24a4bc5880edb4ea5c59c213a9cf3c1a27a9e06d12683eead70d3c26d1d4135c9f3c3767118b72a045b2a7167c124316ca73dabb6247d55fb94fcc9d7ecde4f980c3d85305c5fce0bffae82355db7ed25840ca9738a0618b4a151dc694ad98a3ea9cbec95b731c497f5dce9d2f8ad57de17e020000ffffd191a91753010000", "565cdeaa206a2e0b08f664b571332b02": "1f8b08000000000000ff5ccdb14ec4301084e1de4fb138b490de15125020512004d5e98a8d33388bcc3ada3507bc3d72c115b4a3ffd34c17f3223a2fec5b08d3bae27455a030ee58c334d11d3c9bec5d9a267afe5462ebe2ac74fbf840a22e2ba86fa02f2c949b7616850df8ea5c90cef9e1ad72f1231dd88a1f4770ffcd1f7b45a2385ecf6115ef919afd9b33e70d2957b0c5a19facbd23f7979f1d9ea8b2f1093584ebf90fc4cb9b18c26f000000ffffb9d5e19edf000000", @@ -34,9 +35,9 @@ var _ = func() error { "7c6228a6c7ef5d0443d336cdab6123bc": "1f8b08000000000000ff4c90416ec3400845f73e0552d6f6ec7b8d5c2078f889516d8806ecc6b7af2691aaee40bc8fe05d44708c0f181a2764b8d6a6cf0c52a35c3448b4a1a6b7937e745d6906e185ba2784bc23a0c5238779cfde9c54d928f91b040e5dcf4fcd35d5ad07aa5bb21a5ad07cd21e6a8fe1d64f78afbd4dc3700568c97cc657297d3035b0e402f11a937a8195489e57943dd0a2e0953029758ff46dacbe6d6c12e5023bb4b96db01c0f6eda23313e9b1f2a10ba7b23a65523c9eff40fa63f9872e17c3f3483f6807ca480e2e3681a7e030000ffffb77ce1973d010000", "7c9657a7540eafd259889c880f3e95a7": "1f8b08000000000000ff6c8f31ce022110467baef17724c0197e75cb6df400668459200186c060f4f6c6a8c5ae96f3262f2fdf9f7378551e0b366074c2e84683b1294bb952477d879cbe6853cb48e9f3eb3d28181cb6ce96af241f39fa420d8591d2488d37c835bdaee3f47f98272d85d9cf27617ca20ba4b3a5b244fff62b140e48450a23d759f9abd67b88193cee464ccf91a33a601486b1b3051b503c020000ffff9466e5cb09010000", "800dae8de2a441a90553db3d618aab8b": "1f8b08000000000000ff74ceb16dec400c45d15c553c606369f29ffd1ab682d1f0ad4540e20824475e776fac0d184edcc03df726c26b7ea3d16b52a67b733d33a086dc3420ea6cd9fd03efbaef58093ed94652a0162a446e84ac53eb96558dbee03f6c1c2b1dfd01daa5deeda025aeea5ad79d81ea448cf3dc9582ec5f8df8969769ba93d832cff857ca6b6f7156c98dd25b2cda0bad44be4265043d0a9f4993d246643fe6d68fa39a44b9fdb2e71f7b3ebd5f2a143cbaa362d7c83f4797e9330000ffff15960c3a20010000", - "980540b4eafc1b28426dd9c06ca8db82": "1f8b08000000000000ff4c90b18ee3300c447b7fc5006963abcf6fa4ba2eb23439f36049064939c9df1fe2dd2cb614f4861cbe53cedcc7bfacd4e8ccc335a96c6e900a5fc4904599bce90b0f5957cc049f4cdd9921d52413be100fce436ad5a354ea843fad23c58ad4b6d7f1cf672cdb4adc65259ae25f3787b2c642885f865bd991b5db327dc8e3753be3def4933e23d60cf14f93d40a8788557622b55262cdd3305c492cee9b5d4278df362963f685b9259ba405d6601ee795a11bd5029fce9a43eae6ad8cdf732c9c5877d1560bab8f7b5479476cdcb4ed92998f5eefdde66877fc82f103c397e8878799e876183b6cd897e369f81f0000ffffa67d0e417d010000", + "980540b4eafc1b28426dd9c06ca8db82": "1f8b08000000000000ff5491b1d2e2300c84fb3c85065a12f7bc06d57538f64274634b194b09e1ed6f923b6ef85b6977b5f3e99c33d6fe09418b8edcdd52e3d98d58c82736cadc905cdb9b5e5c0a8d206c488b23138b7106f9047a61ec928a4716b4817ee942290a259ddfc71e5bac73013db880b4d1efc59c1a245610fbb5bbd7951a8ac6dccb93651b3e86efe1fd420f6d9fac0b45c974daebff509d3e45935674910aafa0a4b546c943d7dd009adc67bb86b07b8786987d42d664036b8004f3381684c5d02c6073480e6931d7daffcbb17086acdc542ac4fb3536de2dd6cf4d57cec847d1fdb639e983bec4f45f4c3e453f308da0c50ea0072cfbfb82a1fb130000ffff0534c3d19c010000", "a06cff5b1ff09738b67c168ae71914e7": "1f8b08000000000000ff1ccd314ec4301005d0dea7f8920b24a4ec0da8105bad2868a88de73b19e48c23cfb090db23b8c07b195984f765a57196a0a48c973be7199bda0a35c446d4b1efc5c4213a5963cc13468ae3764557e34213b5d553c6eb083cbfddae288e36c78e773519df7e49191fc537d00f562dbd9ff8fcf2402df610a8e320b441034dffa67f430d055ea71e71498f58823f018efed45bfa0d0000ffff5624b0f4ba000000", - "a8e701da77f72bae5c78ab8145fd51e9": "1f8b08000000000000ff6c8d314fc4300c85f7fc0a93325e7523d009091890181082e974839b98d6109c60a707fc7b14ae0bd24d4f7a7efebeee6c3bb26c47b4d9b92e463af4130929568aaeebe0962c2897ca5906785a04a22e36c3cdc33db01847823a137cd108214b4516d2f6f66238d1b08e77af0927dbc30e75b27d3bdf7de3474934806fc675b624f690f55f679fa90f27fabe3f901a67f10df7a8f98d427dfe29647fd282e96273cccb35af362386f7a8b9387764f8f36bef7e030000ffff477c613200010000", + "a8e701da77f72bae5c78ab8145fd51e9": "1f8b08000000000000ff6c8f414fe3301484effe155367a55e9a8df6b4502484041c903820040754f5f062bf260f1c3bb59dd0fe7b94a61c90b878a499f13776b1a86af1554da955aab096c7b261cf91325b5514b8e364a2f459825fe379f0b071482d6e1f1f203e8965e496f1c9354cf099c4739caebd266a787d2e6f768e9ab4c5866293b6537c7fa0ae77bc869e16cfb5c18946883fbcb477a5f9c52fcb916392e0f5847b8ae19d4d7e39f69c4ea33db9ffab592fce7ab9aac97cd8187aa56487054ce83af216e537f3bab23c567e70ee6afa9457009b3640cfb124f890412389a3daf15fbc85011d1de1992d72c0f2f44013ba3e248e88bc1f24f24caf4ee7524fd08364fc533b513358ffb9d1ea2b0000ffffadad75f488010000", "ab8086424c88aa7dc60967d4c9b99439": "1f8b08000000000000ffac554d6fe33610bdf35770151fda8345bbd8450b43d122b11424a89b082ba5684f062d8d6d76259221477184c5fef782fe4864af5645bad149e0bcf7f886e4cc9cbd630b21d982db35216745018fc31548301ca120676734029b1ba1512839a19f6a492d3cd4506aa3e846e09ae6b53120916aa3fe811c69c1912fb805c7bdb77c059317865b8b9f78a54b9850cfedf512f35cf02ecd1a0d76420b6e3642baa56b65f152486e9af84958b413ca2eb42e45ce9d25cbd2ad004d8cf2b9d68460a50b61ce073f559f112a4d87051de2cb36c3bf9ebf9f8903941c41735c9f7b831d953d637dab971e2139471a0eda581a04f16d44828f4f55491fc158a1e4b937f6471e0599ab42c8d5b9779f5d0d7ff33e86247817dd4db3bf9398ea5258a4c9fde5ec664abd21db66028c45594493d94d9ad1b13f622cbef5a8b746d413c6369b8dcbab043f5795035a9618a5c16033131687637fe4175878210976ea477642121422c790504a69f0199a70aa2482c42b5122181b30b7b68b3a206b21798d6a9e2b2921c7360e4d0d6d9cbbf0539dddef3364af22946c013bc0479aee119dc0b7718b46c855582c02b6fffd96bf56167bb8e35f7ef547fec81ff748485ef56d3ff81245f19ff3f4268b6f2ffe88bff628696eed4699a247cd28857d0aca74a62324c20a4c38d87ab9be4bb37974394fee3e65013bc4be5533c5a2b2736c745f7e55631fca1e4bd696d38b2918f79260a676d5d8a3f75aa958f245099d6776c86cd497a413058362e91a05bc8dc96ebd3770fa3b346fe2f044e7479dfdc71349936c9adc24d356717fd75c6d214d67ffdb496dc1bcba7c02d6ea7deca40f82cc4da3f1e87482252fed516f5b2a53f1a3eeb7df24ff4ed25bd6430da6b9e28fca0884a31ecb8de10d3b855e0b8bca34bdc0cea2ed29d616693f113a781ffc0ffefbf71dc40ecae172c6ad7b3a9c6ac0b6b327246e2a12a54152ea0dbeb447e6578f907f030000ffff184e11e16b080000", "b33d6a393c92fd7a28c32f6ef6cd6db3": "1f8b08000000000000ff6c8f3f4bc44010c5fbfd146372851672c575b1515450100c120b118b49764c4692d9b033f7efdbcbae5110ae7dbfe1fdde9467eb9665dda20ece95ded3eeb227a18846de95d00cac80aadb89146c40031b08ec38870d74619a503cec791ca12560c97055df340f57c09f29d891f810b302d87e4f9d2b4bb823ed22cfc6412a78d90a346ff5f3066e9f1ee13c0b2efe0c2cca9e72fb9e5ae88218b2504c35af8a3d55cba4778cbd7ea4f8fe80d33c520545fa69c1ca46d5c86a0584f88f9c0ce960249af6659c6aeb18bea8b3e638932e52e77eae8bd575e1be030000fffff43c802c4f010000", "b60a5631b4bb0b9cfafe92badf35d2fc": "1f8b08000000000000ffa4925f6fd34a10c5dff7539cbb4e6f752bd96eef0bc81112a509ea0325a109a04a95aab53db597da3beeeeba89057c77b48e5a68cb03122f2bff393bf39b3327fa27cdb54973e56a21a2085159d25d5c9121ab3c95e1d38c5c6175e7359b0ce7bdc1d9b0faf0ee33db9b9c4c5143554a1be751f4d692f128f370eba3531565680777db6ceeb5e1c77cabdaaea10c32b47a2290424478cf9ee06be5e16bed405bd53684de91c364369b7fba3a5dacd657b33757cbc5f91a9e515190123ab61ed76cc797828da122508b0867a10b7e3217ca202770ee953654e2da728bdafbce65695ad25d32622505b769c91bd3b02a5dfa40990a71db931d5e49cbecb370bc3efaff4572981c2647d9e4eb33c8ef52884239c264b15a5f2ce7d046008d36fd36ae4cff9f00800817dca355030c5109a93a1f87c982b9aa69d0e8bcb3fc250eae55865b8a6f68b0da5412fa1adaa3e0b66bc22ea072ee8325ec682c3d4e133ff0238e477e404ec607897f471d1535431e7b4f6de7a90cde36aa0f379e5490a37c3a150290a5b21b6de4c16e0c991e775da30b15ac77e9e3b024aaebd213369e8c77e9992a16ab270af900f7c76ccf5b3cc2db6873200ff00db27583bbc78cb07f925d2e2d5756b578ab1b729763a1ddf94b565e268738995f3e0e6a425bdaffddda3c4395655887670cdc5bb8c1796ab1b73c5e9fee812d8a5a998a768955be464d76b7a6bf277a66de0e713a15e454217e040000ffff0a6b4a3dee030000", @@ -48,9 +49,7 @@ var _ = func() error { "e0a7c313cc6cfebdd1c68244f696aea1": "1f8b08000000000000ff9492df6bdb3e14c5dffd579caf5cbe65258edbbc0c5cf2b02e1e29b44b56671b834250ac1b47604b99ae1c276cfddf87f2abec61b0bdd9ba1f9d7baece8dff4b17daa40bc9ab288a63c44ad126a9c890939e5486fb2576b645278d87b720a53da451b09d815f69c652d7d483a3c66ee870526b43fd2036222e9d5e7b6d4d86a7d6604c5ae9e2d3036425b5618fb2758e8c875a04fe33cb8a32ac02c5dfeb70946f65b3ae298308c6ce25116a9362b65b1367e8b451b6e35ec7f52014c696fd9d36d2edf2ad66cf1944da189f96e9d4d9cac9061f744d9c9eeca427d93e6da9f73e7bfe0d7b3e61878f2326a248baaa6dc8781e8a245959f6c39bc1dbfe75ffba7f8324595be787173f46a3fccb7c3c2966f3d1dd7c3a799abd20495a263774d6fac049e6ce3a75fa57af8f76ba5edccff28fef1ef3171145a564c2c5a4987d9be6d0260244a7cd95b8c24f8886772caede440070f977e35e425c9c0711f87f7ff7f63602e21064bb4d2ad3421fc3de77d70c6bea1dbe160f034806534da52715a86326900bbba160eeac210eb6e2d725d08c475d3acb76e9f78a3d2c5a8f8ecedbc65e3a0fedb174b6d9f7db6bfc439ae20fe311cb32fa150000ffffb92696dafd020000", "e0cd29906a22fdca23ce152b565b2412": "1f8b08000000000000ff8ccc3d4e2c311004e0dca728e9052f5a7306124e408e7aec02b7f0748fdccd2c7b7bb401120101e9573fff7ae77979a37149b297279d0ca8a1de8387e13ba5774d750b5c754e6c44f343d9a1968e1cc4951b9a5b8a1ad7ffc07d85ae8b2d7ddd6a298f067eca7e4c6293182f32558251bf5103c7f2533b3b06172b9e1dbbbc133934f0aa9390967a1237ff40130335075729edf8fdb2fed4e20bd37089bf74bf020000ffff76526b0213010000", "e28fdb901662d2de6aeffe41ce3c4ebd": "1f8b08000000000000ff74cd3d8e83301086e1dea798c5db023dc56a8be408a910858d27c692b1cd8cc90fcae123a70952946aa4771ee9933fad76a1d58a2721a404690c5e6a8b01496534251d90477229bb183aa035c07ce7c59b754ee0025c51c31843562e20157e6265b1dba1feec95e5017a459687428e3735278f1d54656d478dae20d2478e7942faf2331a1e603797e0cfe88617dfd8ad12e20dea9562cc50a7d7f9fd17cf000000ffffd1f447b9f3000000", - "e885dda881636c9b933481140910b89c": "1f8b08000000000000ff548d3d0ec2300c46f79cc23473d4bd33488c08a907701b27b5489dc889a0c747415d58dff7f3ec655c58c605eb668cb560bda7b78b24a4d8c87774a5ba2a97c659267852cae861cd123842c80a12590e40f150b6e242d981a5b227f8d0d27b0d5948fbd15c31d2044ab5a136f71b767e3b702f892618bafc3f1f8c79714a9812b8fbfc386da7c97c030000ffff80a84502be000000", "ef4b402bf593682c6c4a55ffbce4978a": "1f8b08000000000000ff3c8e314fc4300c46f7fc8a8f2b23e5f66e483d892d150556e426e61244132bf10115e2bfa3dcd0cd7acf965f77735c623a2e5483315d87ce7bfeeacf9cb890b26f68e4ea4a148d390db0c209d3e3346b2e2bbea3066860b84b299c1452f2073b6d672f95ce3c4082d4b6dbd0e98756f9e40187f665570763768758b192b3735f855d7c8fee0ecb45c1543768067912bd0e69839d4d6e3d3ded49f72482dbdf713cbdbe3d4cd393b5cf7fe63f0000ffff18fb6254e5000000", - "fcd75c9f3ae270f02667d0a6bc7f3629": "1f8b08000000000000ff6c90b14e03310c86f73c85691840e294fd260678010453d5c1bd983b4ba9536ce7ae7d7b746d054262fdf27f7f7e39dea53d4bdaa34d21c40831679abb9184149df28a5ec806e5a373951ede9a40d66613b01867029f0816dac350c5918574553e0c47ea6fc1ed67c1d176b0451d6db73ebf9ef0702cd4c366fded166b853750f50fb3afd20dfff0ae9b498dab6c42b892fbe71022bc576876dd64ecd4b1986329946f5e66a5c1cb191e147d22059f50409b08cb08a999a652072c979b5c94c7a710e15c1b1c789c1c161407af40271a9a13b0ff74f621860869464dcbb2a4c90f25cd24b9ea6fdb3af33b0000ffff1df1f36072010000", }) if err != nil { panic(err) @@ -71,9 +70,7 @@ var _ = func() error { b.SetResolver("commands/solr/README.txt", packr.Pointer{ForwardBox: gk, ForwardPath: "413082224d141b25ab8047dbbb46a60f"}) b.SetResolver("commands/solr/solrtail.example", packr.Pointer{ForwardBox: gk, ForwardPath: "3a64652d196409b117a6642982703e11"}) b.SetResolver("commands/web/README.txt", packr.Pointer{ForwardBox: gk, ForwardPath: "14c63bd11eb5c6e19c764e5ac5649a59"}) - b.SetResolver("commands/web/drush.example", packr.Pointer{ForwardBox: gk, ForwardPath: "fcd75c9f3ae270f02667d0a6bc7f3629"}) b.SetResolver("commands/web/live", packr.Pointer{ForwardBox: gk, ForwardPath: "08efec459d444bc9eb8bf32159d4a2e3"}) - b.SetResolver("commands/web/reload-nginx.example", packr.Pointer{ForwardBox: gk, ForwardPath: "e885dda881636c9b933481140910b89c"}) b.SetResolver("commands/web/xdebug", packr.Pointer{ForwardBox: gk, ForwardPath: "36a16b6b6dedc9b09ade15b72f6da34c"}) b.SetResolver("homeadditions/README.txt", packr.Pointer{ForwardBox: gk, ForwardPath: "e0cd29906a22fdca23ce152b565b2412"}) b.SetResolver("homeadditions/bash_aliases.example", packr.Pointer{ForwardBox: gk, ForwardPath: "cebc447d1b7e67f7dfc2577999fca482"}) @@ -96,6 +93,7 @@ var _ = func() error { b.SetResolver("commands/web/artisan", packr.Pointer{ForwardBox: gk, ForwardPath: "565cdeaa206a2e0b08f664b571332b02"}) b.SetResolver("commands/web/drush", packr.Pointer{ForwardBox: gk, ForwardPath: "a8e701da77f72bae5c78ab8145fd51e9"}) b.SetResolver("commands/web/magento", packr.Pointer{ForwardBox: gk, ForwardPath: "7b12f0fa2b5500e80bcf6b6c591bf919"}) + b.SetResolver("commands/web/reload-nginx.example", packr.Pointer{ForwardBox: gk, ForwardPath: "3d17d9b1e811ea02f7f3f998dccb0eaf"}) b.SetResolver("commands/web/typo3", packr.Pointer{ForwardBox: gk, ForwardPath: "b33d6a393c92fd7a28c32f6ef6cd6db3"}) b.SetResolver("commands/web/typo3cms", packr.Pointer{ForwardBox: gk, ForwardPath: "4753795b9a57fb973233eb16c0036470"}) b.SetResolver("commands/web/wp", packr.Pointer{ForwardBox: gk, ForwardPath: "3680182c262a9957e45fefd42fac49c5"}) diff --git a/containers/ddev-webserver/Dockerfile b/containers/ddev-webserver/Dockerfile index 9f31a4e05d5..a726320fcdb 100644 --- a/containers/ddev-webserver/Dockerfile +++ b/containers/ddev-webserver/Dockerfile @@ -3,7 +3,7 @@ ### Build ddev-php-base from ddev-webserver-base ### ddev-php-base is the basic of ddev-php-prod (for DDEV-Live) ### and ddev-webserver-* (For DDEV-Local) -FROM drud/ddev-php-base:v0.7.6 as ddev-webserver-base +FROM drud/ddev-php-base:v0.7.7 as ddev-webserver-base ENV BACKDROP_DRUSH_VERSION=1.4.0 ENV MKCERT_VERSION=v1.4.6 diff --git a/containers/ddev-webserver/ddev-webserver-base-scripts/start.sh b/containers/ddev-webserver/ddev-webserver-base-scripts/start.sh index 819bee0c996..53a255adf7f 100755 --- a/containers/ddev-webserver/ddev-webserver-base-scripts/start.sh +++ b/containers/ddev-webserver/ddev-webserver-base-scripts/start.sh @@ -38,6 +38,10 @@ if [ "$DDEV_PROJECT_TYPE" = "backdrop" ] ; then mkdir -p ~/.drush/commands && ln -s /var/tmp/backdrop_drush_commands ~/.drush/commands/backdrop fi +if [ "${DDEV_PROJECT_TYPE}" = "drupal6" ] || [ "${DDEV_PROJECT_TYPE}" = "drupal7" ] ; then + ln -sf /usr/local/bin/drush8 /usr/local/bin/drush +fi + # Change the apache run user to current user/group printf "\nexport APACHE_RUN_USER=$(id -un)\nexport APACHE_RUN_GROUP=$(id -gn)\n" >>/etc/apache2/envvars diff --git a/containers/ddev-webserver/ddev-webserver-prod-scripts/start.sh b/containers/ddev-webserver/ddev-webserver-prod-scripts/start.sh index fa204dab165..719376dae0f 100755 --- a/containers/ddev-webserver/ddev-webserver-prod-scripts/start.sh +++ b/containers/ddev-webserver/ddev-webserver-prod-scripts/start.sh @@ -38,6 +38,10 @@ if [ "$DDEV_PROJECT_TYPE" = "backdrop" ] ; then mkdir -p ~/.drush/commands && ln -s /var/tmp/backdrop_drush_commands ~/.drush/commands/backdrop fi +if [ "${DDEV_PROJECT_TYPE}" = "drupal6" ] || [ "${DDEV_PROJECT_TYPE}" = "drupal7" ] ; then + ln -sf /usr/local/bin/drush8 /usr/local/bin/drush +fi + # Change the apache run user to current user/group printf "\nexport APACHE_RUN_USER=$(id -un)\nexport APACHE_RUN_GROUP=$(id -gn)\n" >>/etc/apache2/envvars diff --git a/pkg/ddevapp/ddevapp_test.go b/pkg/ddevapp/ddevapp_test.go index 637a6921cd3..87dd3625d3a 100644 --- a/pkg/ddevapp/ddevapp_test.go +++ b/pkg/ddevapp/ddevapp_test.go @@ -1834,8 +1834,6 @@ func TestDdevExec(t *testing.T) { case nodeps.AppTypeDrupal6: fallthrough case nodeps.AppTypeDrupal7: - fallthrough - case nodeps.AppTypeDrupal8: out, _, err = app.Exec(&ddevapp.ExecOpts{ Service: "web", Cmd: "drush status", diff --git a/pkg/version/version.go b/pkg/version/version.go index fe2b662f0f9..338daa9c949 100644 --- a/pkg/version/version.go +++ b/pkg/version/version.go @@ -40,7 +40,7 @@ var DockerComposeFileFormatVersion = "3.6" var WebImg = "drud/ddev-webserver" // WebTag defines the default web image tag for drud dev -var WebTag = "20201227_travis_router_http2_max_header" // Note that this can be overridden by make +var WebTag = "20201230_stop_using_drush_launcher" // Note that this can be overridden by make // DBImg defines the default db image used for applications. var DBImg = "drud/ddev-dbserver"