Add docker:push command

Author: bram-pkg

bin/common-functions

@@ -0,0 +1,37 @@
+#!/usr/bin/env bash
+
+check_laravel() {
+  if ! [[ -f "${PWD}/public/index.php" ]]; then
+    echo "Missing [/public/index.php], please run from Laravel base directory.";
+    exit 1
+  fi
+}
+
+check_dockerfiles() {
+  if ! [[ -f "$PWD/.docker/nginx.dockerfile" ]]; then
+    echo "Dockerfile [/.docker/nginx.dockerfile] not found."
+    echo "Run: php artisan docker:generate"
+    exit 1
+  fi
+
+  if ! [[ -f "$PWD/.docker/php.dockerfile" ]]; then
+    echo "Dockerfile [/.docker/php.dockerfile] not found."
+    echo "Run: php artisan docker:generate"
+    exit 1
+  fi
+}
+
+check_tags() {
+  NGINX_TAG="${DOCKER_NGINX_TAG}"
+  PHP_TAG="${DOCKER_PHP_TAG}"
+
+  if [[ -z "${NGINX_TAG}" ]]; then
+    echo "Environment variable [DOCKER_NGINX_TAG] not found."
+    exit 1
+  fi
+
+  if [[ -z "${PHP_TAG}" ]]; then
+    echo "Environment variable [DOCKER_PHP_TAG] not found."
+    exit 1
+  fi
+}

bin/docker-build

@@ -1,40 +1,20 @@
 #!/usr/bin/env bash
 
-PACKAGE="$(dirname "${BASH_SOURCE[0]}")/.."
+SCRIPT_DIR="$(dirname "${BASH_SOURCE[0]}")"
+PACKAGE="${SCRIPT_DIR}/.."
 
-if ! [[ -f "${PWD}/public/index.php" ]]; then
-  echo "Missing [/public/index.php], please run from Laravel base directory.";
-  exit 1
-fi
-
-if ! [[ -f "${PWD}/.dockerignore" ]]; then
-  echo "Missing [/.dockerignore], copying...";
-  cp "${PACKAGE}/docker/.dockerignore" "${PWD}/.dockerignore"
-fi
-
-if ! [[ -f "$PWD/.docker/nginx.dockerfile" ]]; then
-  echo "Dockerfile [/.docker/nginx.dockerfile] not found."
-  echo "Run: php artisan docker:generate"
-  exit 1
-fi
+source "${SCRIPT_DIR}/common-functions"
 
-if ! [[ -f "$PWD/.docker/php.dockerfile" ]]; then
-  echo "Dockerfile [/.docker/php.dockerfile] not found."
-  echo "Run: php artisan docker:generate"
-  exit 1
-fi
+check_laravel
+check_dockerfiles
+check_tags
 
 NGINX_TAG="${DOCKER_NGINX_TAG}"
 PHP_TAG="${DOCKER_PHP_TAG}"
 
-if [[ -z "${NGINX_TAG}" ]]; then
-  echo "Environment variable [DOCKER_NGINX_TAG] not found."
-  exit 1
-fi
-
-if [[ -z "${PHP_TAG}" ]]; then
-  echo "Environment variable [DOCKER_PHP_TAG] not found."
-  exit 1
+if ! [[ -f "${PWD}/.dockerignore" ]]; then
+  echo "Missing [/.dockerignore], copying to [${PWD}/.dockerignore]";
+  cp "${PACKAGE}/docker/.dockerignore" "${PWD}/.dockerignore"
 fi
 
 docker build \

bin/docker-push

@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+
+SCRIPT_DIR="$(dirname "${BASH_SOURCE[0]}")"
+
+source "${SCRIPT_DIR}/common-functions"
+
+check_laravel
+check_dockerfiles
+check_tags
+
+NGINX_TAG="${DOCKER_NGINX_TAG}"
+PHP_TAG="${DOCKER_PHP_TAG}"
+
+docker push "${NGINX_TAG}"
+docker push "${PHP_TAG}"

src/Commands/BaseDockerCommand.php

@@ -0,0 +1,26 @@
+<?php
+
+namespace BlameButton\LaravelDockerBuilder\Commands;
+
+use Symfony\Component\Process\Process;
+
+abstract class BaseDockerCommand extends BaseCommand
+{
+    protected function getEnvironment(): array
+    {
+        return [
+            'DOCKER_NGINX_TAG' => config('docker-builder.tags.nginx'),
+            'DOCKER_PHP_TAG' => config('docker-builder.tags.php'),
+        ];
+    }
+
+    protected function runProcess(Process $process): int
+    {
+        return $process->run(function ($type, $buffer) {
+            match ($type) {
+                Process::OUT => fwrite(STDOUT, $buffer),
+                Process::ERR => fwrite(STDERR, $buffer),
+            };
+        });
+    }
+}

src/Commands/DockerBuildCommand.php

@@ -4,30 +4,22 @@
 
 use Symfony\Component\Process\Process;
 
-class DockerBuildCommand extends BaseCommand
+class DockerBuildCommand extends BaseDockerCommand
 {
     protected $name = 'docker:build';
 
+    protected $description = 'Build Docker images';
+
     public function handle(): int
     {
         $command = package_path('bin/docker-build');
 
         $process = new Process(
             command: [$command],
             cwd: base_path(),
-            env: [
-                'DOCKER_NGINX_TAG' => config('docker-builder.tags.nginx'),
-                'DOCKER_PHP_TAG' => config('docker-builder.tags.php'),
-            ],
+            env: $this->getEnvironment(),
         );
 
-        $process->run(function ($type, $buffer) {
-            match ($type) {
-                Process::OUT => fwrite(STDOUT, $buffer),
-                Process::ERR => fwrite(STDERR, $buffer),
-            };
-        });
-
-        return self::SUCCESS;
+        return $this->runProcess($process);
     }
 }

src/Commands/DockerPushCommand.php

@@ -0,0 +1,25 @@
+<?php
+
+namespace BlameButton\LaravelDockerBuilder\Commands;
+
+use Symfony\Component\Process\Process;
+
+class DockerPushCommand extends BaseDockerCommand
+{
+    protected $name = 'docker:push';
+
+    protected $description = 'Push Docker images';
+
+    public function handle(): int
+    {
+        $command = package_path('bin/docker-push');
+
+        $process = new Process(
+            command: [$command],
+            cwd: base_path(),
+            env: $this->getEnvironment(),
+        );
+
+        return $this->runProcess($process);
+    }
+}

src/DockerServiceProvider.php

@@ -4,6 +4,7 @@
 
 use BlameButton\LaravelDockerBuilder\Commands\DockerBuildCommand;
 use BlameButton\LaravelDockerBuilder\Commands\DockerGenerateCommand;
+use BlameButton\LaravelDockerBuilder\Commands\DockerPushCommand;
 use Illuminate\Support\ServiceProvider;
 
 class DockerServiceProvider extends ServiceProvider
@@ -14,6 +15,7 @@ public function boot(): void
             $this->commands([
                 DockerBuildCommand::class,
                 DockerGenerateCommand::class,
+                DockerPushCommand::class,
             ]);
         }