From 3cb1884bcb1f42edb75f9695b13000bf9c15be93 Mon Sep 17 00:00:00 2001
From: jurgenhaas <juergen@paragon-es.de>
Date: Wed, 25 Oct 2017 15:47:00 +0200
Subject: [PATCH] #8 Use lakedrops/dotenv to store username for aliases
---
composer.json | 3 ++-
src/Handler.php | 11 ++++++-----
templates/.env.twig | 2 --
3 files changed, 8 insertions(+), 8 deletions(-)
delete mode 100644 templates/.env.twig
diff --git a/composer.json b/composer.json
index 3817d39..82801db 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 1ffe9ed..30f2b20 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 3c1ba47..0000000
--- a/templates/.env.twig
+++ /dev/null
@@ -1,2 +0,0 @@
-# Do not change manually
-COMPOSE_PROJECT_NAME={{ projectname }}
--
GitLab