Add publish command for config file

Author: bram-pkg

README.md

@@ -8,36 +8,23 @@ composer require --dev blamebutton/laravel-docker-builder
 
 ## Configuration
 
-Two environment variables need to be set:
-
-* `DOCKER_NGINX_TAG`
-* `DOCKER_PHP_TAG`
-
-This can be done either by adding them to your `.env` file or passing them to the build command.
-
-### Option 1: `.env`
-
-```
-DOCKER_NGINX_TAG=laravel-app:nginx
-DOCKER_PHP_TAG=laravel-app:php
-```
-
-### Option 2: CLI
+### Option 1: Config File
 
 ```shell
-DOCKER_NGINX_TAG=laravel-app:nginx DOCKER_PHP_TAG=laravel-app:php vendor/bin/docker-build
+php artisan vendor:publish --provider="BlameButton\LaravelDockerBuilder\DockerServiceProvider"
 ```
 
-### Option 3: Config File
+### Option 2: `.env`
+
+By default, the configuration file reads the following environment variables to determine the Docker image tags.
 
 ```shell
-php artisan vendor:publish --provider="BlameButton\LaravelDockerBuilder\DockerServiceProvider"
+DOCKER_NGINX_TAG=laravel-app:nginx
+DOCKER_PHP_TAG=laravel-app:php
 ```
 
 ## Usage
 
-Set the `DOCKER_NGINX_TAG` and `DOCKER_PHP_TAG` environment variables and run:
-
 ```shell
-vendor/bin/docker-build
+php artisan docker:build
 ```

bin/docker-build

@@ -1,7 +1,5 @@
 #!/usr/bin/env bash
 
-source .env
-
 PACKAGE="$(dirname "${BASH_SOURCE[0]}")/.."
 
 if ! [[ -f "${PWD}/public/index.php" ]]; then
@@ -14,6 +12,18 @@ if ! [[ -f "${PWD}/.dockerignore" ]]; then
   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
+
+if ! [[ -f "$PWD/.docker/php.dockerfile" ]]; then
+  echo "Dockerfile [/.docker/php.dockerfile] not found."
+  echo "Run: php artisan docker:generate"
+  exit 1
+fi
+
 NGINX_TAG="${DOCKER_NGINX_TAG}"
 PHP_TAG="${DOCKER_PHP_TAG}"
 
@@ -27,13 +37,11 @@ if [[ -z "${PHP_TAG}" ]]; then
   exit 1
 fi
 
-echo "Building [${NGINX_TAG}]"
 docker build \
   --tag "${NGINX_TAG}" \
   --file "${PWD}/.docker/nginx.dockerfile" \
   "${PWD}"
 
-echo "Building [${PHP_TAG}]"
 docker build \
   --tag "${PHP_TAG}" \
   --file "${PWD}/.docker/php.dockerfile" \

composer.json

@@ -9,9 +9,6 @@
             "email": "bram@ceulemans.dev"
         }
     ],
-    "bin": [
-        "bin/docker-build"
-    ],
     "require": {
         "php": "^8.0",
         "illuminate/contracts": "^9.47",

config/docker-build.php renamed to config/docker-builder.php

@@ -2,7 +2,6 @@
 
 namespace BlameButton\LaravelDockerBuilder\Commands;
 
-use BlameButton\LaravelDockerBuilder\DockerServiceProvider;
 use Symfony\Component\Process\Process;
 
 class DockerBuildCommand extends BaseCommand
@@ -16,6 +15,10 @@ public function handle(): int
         $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'),
+            ],
         );
 
         $process->run(function ($type, $buffer) {

src/Commands/DockerBuildCommand.php

@@ -18,11 +18,11 @@ public function boot(): void
         }
 
         $this->publishes([
-            __DIR__ . '/../config/docker-build.php' => config_path('docker-build.php'),
+            __DIR__ . '/../config/docker-builder.php' => config_path('docker-builder.php'),
         ]);
 
         $this->mergeConfigFrom(
-            __DIR__ . '/../config/docker-build.php', 'docker-builder',
+            __DIR__ . '/../config/docker-builder.php', 'docker-builder',
         );
     }