Update env

Author: khs1994

.env.example

@@ -0,0 +1,10 @@
+PHP_DOCKER_HOSTNAME=default
+PHP_DOCKER_HOST=127.0.0.1:2375
+PHP_DOCKER_TLS_VERIFY=false
+PHP_DOCKER_CERT_PATH=
+PHP_DOCKER_USERNAME=
+PHP_DOCKER_PASSWORD=
+PHP_DOCKER_REGISTRY=
+PHP_DOCKER_TIMEOUT=100
+
+PHP_DOCKER_OTHER_HOST=1.2.3.4:2375

.gitignore

@@ -25,3 +25,7 @@ __pycache__
 *.tar
 
 *.tar.gz
+
+.env
+.env.*
+!.env.example

config/docker.php

@@ -3,29 +3,29 @@
 declare(strict_types=1);
 
 return [
-    'default' => env('DOCKER_APP', 'default'),
+    'default' => env('PHP_DOCKER_HOSTNAME', 'default'),
 
-    // common config
-    'timeout' => env('DOCKER_TIMEOUT', 0),
-    'tls_verify' => env('DOCKER_TLS_VERIFY', false),
-    'cert_path' => env('DOCKER_CERT_PATH', null),
-    'username' => env('DOCKER_USERNAME', null),
-    'password' => env('DOCKER_PASSWORD', null),
-    'registry' => env('DOCKER_REGISTRY', null),
+    // global config
+    'timeout' => env('PHP_DOCKER_TIMEOUT', 0),
+    'tls_verify' => env('PHP_DOCKER_TLS_VERIFY', false),
+    'cert_path' => env('PHP_DOCKER_CERT_PATH', null),
+    'username' => env('PHP_DOCKER_USERNAME', null),
+    'password' => env('PHP_DOCKER_PASSWORD', null),
+    'registry' => env('PHP_DOCKER_REGISTRY', null),
 
-    'app' => [
+    'hosts' => [
         'default' => [
-            'host' => env('DOCKER_HOST', '127.0.0.1:2375'),
-            'tls_verify' => env('DOCKER_TLS_VERIFY', false),
-            'cert_path' => env('DOCKER_CERT_PATH', null),
-            'username' => env('DOCKER_USERNAME', null),
-            'password' => env('DOCKER_PASSWORD', null),
-            'registry' => env('DOCKER_REGISTRY', null),
-            'timeout' => env('DOCKER_TIMEOUT', 0),
+            'host' => env('PHP_DOCKER_HOST', '127.0.0.1:2375'),
+            'tls_verify' => env('PHP_DOCKER_TLS_VERIFY', false),
+            'cert_path' => env('PHP_DOCKER_CERT_PATH', null),
+            'username' => env('PHP_DOCKER_USERNAME', null),
+            'password' => env('PHP_DOCKER_PASSWORD', null),
+            'registry' => env('PHP_DOCKER_REGISTRY', null),
+            'timeout' => env('PHP_DOCKER_TIMEOUT', 0),
         ],
 
-        'my-other-host' => [
-            'host' => env('DOCKER_HOST', '123.206.62.20:2375'),
+        'other-host' => [
+            'host' => env('PHP_DOCKER_OTHER_HOST', '123.206.62.20:2375'),
         ],
     ],
 ];

src/Docker/Kernel/ServiceProvider.php

@@ -29,16 +29,16 @@ public function register(): void
         $this->mergeConfigFrom($configPath, 'docker');
 
         $this->app->singleton('docker', function () {
-            $app_name = config('docker.default');
+            $host_name = config('docker.default');
 
             return Docker::docker(Docker::createOptionArray(
-                config('docker.'.$app_name.'.host'),
-                config('docker.app.'.$app_name.'.tls_verify') ?? config('docker.tls_verify'),
-                config('docker.app.'.$app_name.'.cert_path') ?? config('docker.cert_path'),
-                config('docker.app.'.$app_name.'.username') ?? config('docker.username'),
-                config('docker.app.'.$app_name.'.password') ?? config('docker.password'),
-                config('docker.app.'.$app_name.'.registry') ?? config('docker.registry'),
-                config('docker.app.'.$app_name.'.timeout') ?? config('docker.timeout')
+                config('docker.hosts.'.$host_name.'.host', '127.0.0.1:2375'),
+                config('docker.hosts.'.$host_name.'.tls_verify') ?? config('docker.tls_verify'),
+                config('docker.hosts.'.$host_name.'.cert_path') ?? config('docker.cert_path'),
+                config('docker.hosts.'.$host_name.'.username') ?? config('docker.username'),
+                config('docker.hosts.'.$host_name.'.password') ?? config('docker.password'),
+                config('docker.hosts.'.$host_name.'.registry') ?? config('docker.registry'),
+                config('docker.hosts.'.$host_name.'.timeout') ?? config('docker.timeout')
             ));
         });
 

src/Docker/Kernel/Support/helpers.php

@@ -12,7 +12,7 @@
      */
     function docker()
     {
-        return app(Docker\Docker::class);
+        return app('docker');
     }
 }