Merge pull request #3 from netsells/feature/tidy-docker-login

Tidies up docker login

README.md

@@ -35,8 +35,9 @@ netsells
   aws:ssm:start-session    Configures your machine for SSM SSH connections
 
   docker:aws:deploy-update Updates task definition and service
-  docker:aws:push          Pushes docker-compose created images to ECR.
-  docker:build             Builds docker-compose ready for prod.
+  docker:aws:login         Logs into docker via the AWS account
+  docker:aws:push          Pushes docker-compose created images to ECR
+  docker:build             Builds docker-compose ready for prod
 ```
 
 ## Netsells File Reference

app/Commands/DockerBuildCommand.php

@@ -23,7 +23,7 @@ class DockerBuildCommand extends Command
      *
      * @var string
      */
-    protected $description = 'Builds docker-compose ready for prod.';
+    protected $description = 'Builds docker-compose ready for prod';
 
     /** @var Helpers $helpers */
     protected $helpers;

app/Commands/DockerLoginCommand.php

@@ -0,0 +1,63 @@
+<?php
+
+namespace App\Commands;
+
+use App\Helpers\Helpers;
+use App\Helpers\NetsellsFile;
+use App\Exceptions\ProcessFailed;
+use Symfony\Component\Process\Process;
+use LaravelZero\Framework\Commands\Command;
+use Symfony\Component\Console\Input\InputOption;
+
+class DockerLoginCommand extends Command
+{
+    /**
+     * The signature of the command.
+     *
+     * @var string
+     */
+    protected $signature = 'docker:aws:login';
+
+    /**
+     * The description of the command.
+     *
+     * @var string
+     */
+    protected $description = 'Logs into docker via the AWS account';
+
+    /** @var Helpers $helpers */
+    protected $helpers;
+
+    public function __construct(Helpers $helpers)
+    {
+        $this->helpers = $helpers;
+        parent::__construct();
+    }
+
+    public function configure()
+    {
+        $this->setDefinition($this->helpers->aws()->commonConsoleOptions());
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return mixed
+     */
+    public function handle()
+    {
+        $requiredBinaries = ['docker', 'aws'];
+
+        if ($this->helpers->checks()->checkAndReportMissingBinaries($this, $requiredBinaries)) {
+            return 1;
+        }
+
+        $loginSuccessful = $this->helpers->aws()->ecs()->authenticateDocker($this);
+
+        if (!$loginSuccessful) {
+            return 1;
+        }
+
+        $this->info("Logged into docker.");
+    }
+}

app/Commands/DockerPushCommand.php

@@ -23,7 +23,7 @@ class DockerPushCommand extends Command
      *
      * @var string
      */
-    protected $description = 'Pushes docker-compose created images to ECR.';
+    protected $description = 'Pushes docker-compose created images to ECR';
 
     /** @var Helpers $helpers */
     protected $helpers;

app/Helpers/Aws/Ecs.php

@@ -38,8 +38,8 @@ public function authenticateDocker(Command $command): bool
         try {
             $this->aws->helpers->process()->withCommand([
                 'docker', 'login',
-                "--username=AWS",
-                "--password={$password}",
+                '--username', 'AWS',
+                '--password', $password,
                 "{$awsAccountId}.dkr.ecr.{$awsRegion}.amazonaws.com"
             ])
             ->run();