From a5a546d19e418ffc4cc3d388baee6e3973862866 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Dugat?= Date: Tue, 29 May 2018 10:44:26 +0200 Subject: [PATCH] Some fixes + Powerline theme update --- .../DockerContainer/NginxDockerContainer.php | 11 ++--------- .../Resources/views/Service/Common/shell.config.twig | 3 +-- src/Domain/DockerContainer/Model/DockerContainer.php | 2 +- 3 files changed, 4 insertions(+), 12 deletions(-) diff --git a/src/Application/DockerContainer/NginxDockerContainer.php b/src/Application/DockerContainer/NginxDockerContainer.php index 1e7d18d..006a9a1 100644 --- a/src/Application/DockerContainer/NginxDockerContainer.php +++ b/src/Application/DockerContainer/NginxDockerContainer.php @@ -91,16 +91,9 @@ public function postExecute(): void } // Main Network Aliases. - $isServiceNetworkAliasable = function (ServiceInterface $service) { - return null !== $service->getHost(); - }; - if (true === $isServiceNetworkAliasable($service)) { - $this->addNetworkAlias(self::DOCKER_MAIN_NETWORK, $service->getHost()); - } + $this->addNetworkAlias(self::DOCKER_MAIN_NETWORK, $service->getHost()); foreach ($this->vhostsServicesByHost as $vhostService) { - if ($isServiceNetworkAliasable($vhostService)) { - $this->addNetworkAlias(self::DOCKER_MAIN_NETWORK, $vhostService->getHost()); - } + $this->addNetworkAlias(self::DOCKER_MAIN_NETWORK, $vhostService->getHost()); } } diff --git a/src/Application/Resources/views/Service/Common/shell.config.twig b/src/Application/Resources/views/Service/Common/shell.config.twig index f39b49c..c6bd063 100644 --- a/src/Application/Resources/views/Service/Common/shell.config.twig +++ b/src/Application/Resources/views/Service/Common/shell.config.twig @@ -17,8 +17,7 @@ antigen bundle zsh-users/zsh-history-substring-search ./zsh-history-substring-se antigen bundle command-not-found {% if service.options.powerline|default(false) %} -POWERLEVEL9K_INSTALLATION_PATH=$ANTIGEN_BUNDLES/bhilburn/powerlevel9k -antigen theme bhilburn/powerlevel9k powerlevel9k +antigen theme https://github.com/denysdovhan/spaceship-prompt spaceship {% else %} antigen theme nebirhos {% endif %} diff --git a/src/Domain/DockerContainer/Model/DockerContainer.php b/src/Domain/DockerContainer/Model/DockerContainer.php index 056ee70..4bc7803 100644 --- a/src/Domain/DockerContainer/Model/DockerContainer.php +++ b/src/Domain/DockerContainer/Model/DockerContainer.php @@ -222,7 +222,7 @@ protected function applyDotfiles(): void // Volumes. $this ->addVolume([ - 'local' => '~/.ssh', 'remote' => $this->getAbsoluteUserPath('~/.ssh'), 'type' => 'ro' + 'local' => '~/.ssh', 'remote' => $this->getAbsoluteUserPath('~/.ssh'), 'type' => 'rw' ]) ->addVolume([ 'local' => '~/.gitconfig', 'remote' => $this->getAbsoluteUserPath('~/.gitconfig'), 'type' => 'ro'