diff --git a/composer.json b/composer.json index 3817d3919a248d7d5b9661db258af48ffd10bea7..82801dbd07c552b1b0f1f465e63cb3a6c2c58402 100644 --- a/composer.json +++ b/composer.json @@ -26,7 +26,8 @@ "require": { "php": ">=5.4.5", "composer-plugin-api": "^1.0.0", - "lakedrops/docker-traefik": "~0.1", + "lakedrops/docker-traefik": "^0.1", + "lakedrops/dotenv": "^0.1", "twig/twig": "^1.23.1" }, "autoload": { diff --git a/src/Handler.php b/src/Handler.php index 1ffe9ed2aa2bc764b0836b8deecd017a433d019e..30f2b20b65f071580d59c4dfd64080f8fd8a0c26 100644 --- a/src/Handler.php +++ b/src/Handler.php @@ -6,6 +6,7 @@ use Composer\Package\PackageInterface; use Composer\Composer; use Composer\IO\IOInterface; use Composer\Script\Event as ScriptEvent; +use LakeDrops\Component\Dotenv\Dotenv; use LakeDrops\DockerTraefik\Traefik; use Symfony\Component\Filesystem\Filesystem; use Symfony\Component\Yaml\Yaml; @@ -190,9 +191,6 @@ class Handler { 'dest' => $projectRoot . '/drush', 'add2yaml' => TRUE, ], - '.env' => [ - 'dest' => $projectRoot, - ], ]; } @@ -202,9 +200,12 @@ class Handler { * @return array */ protected function getOptions() { + $projectname = str_replace([' ', '-', '_', '.'], '', basename(getcwd())); + $env = new Dotenv('docker4drupal', $this->io); + $env->put('COMPOSE_PROJECT_NAME', $projectname); $extra = $this->composer->getPackage()->getExtra() + ['docker4drupal' => []]; $options = $extra['docker4drupal'] + [ - 'projectname' => str_replace([' ', '-', '_', '.'], '', basename(getcwd())), + 'projectname' => $projectname, 'docker0' => [ 'ip' => $this->getLocalIpv4('docker0'), ], @@ -212,7 +213,7 @@ class Handler { 'root' => '', 'uri' => '', 'host' => '', - 'user' => '', + 'user' => $env->receive('drupal_org_username', 'Remote username for host of the live site', getenv('USER')), ], 'drupal' => [ 'version' => '8', diff --git a/templates/.env.twig b/templates/.env.twig deleted file mode 100644 index 3c1ba471b4bf86aa0c77243e9c39b59dd0c932dd..0000000000000000000000000000000000000000 --- a/templates/.env.twig +++ /dev/null @@ -1,2 +0,0 @@ -# Do not change manually -COMPOSE_PROJECT_NAME={{ projectname }}