Implemented .serverenvs file support
This commit is contained in:
		@@ -13,11 +13,28 @@ class ContainerManager
 | 
			
		||||
 | 
			
		||||
    private array $autoEnv = [];
 | 
			
		||||
 | 
			
		||||
    private array $serverEnvs = [];
 | 
			
		||||
 | 
			
		||||
    public function __construct(?string $dataPath=null)
 | 
			
		||||
    {
 | 
			
		||||
        $this->dataPath = $dataPath ?? (getenv("HOME")."/.var/serverctl");
 | 
			
		||||
        $this->stateFile = $this->dataPath . "/state.json";
 | 
			
		||||
        $this->setupAutoEnv();
 | 
			
		||||
        $this->setupServerEnvs();
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    private function setupServerEnvs()
 | 
			
		||||
    {
 | 
			
		||||
        $file = getenv("HOME")."/.serverenvs";
 | 
			
		||||
 | 
			
		||||
        if (!file_exists($file)) {
 | 
			
		||||
            $this->serverEnvs = [];
 | 
			
		||||
            return;
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        $parsed = parse_ini_file($file, true);
 | 
			
		||||
 | 
			
		||||
        $this->serverEnvs = $parsed;
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    private function setupAutoEnv()
 | 
			
		||||
@@ -105,6 +122,11 @@ class ContainerManager
 | 
			
		||||
        $instanceName = $options['name']??'default';
 | 
			
		||||
        $portOffset = intval($options['portoffset']??0);
 | 
			
		||||
 | 
			
		||||
        $temporary = $option['temporary']??false;
 | 
			
		||||
        if ($temporary) {
 | 
			
		||||
            $instanceName = sprintf("%04x%04x", rand(0,0xFFFF), rand(0,0xFFFF));
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        $containerName = "sm_".$serviceName."_".$instanceName;
 | 
			
		||||
 | 
			
		||||
        $args[] = 'run';
 | 
			
		||||
@@ -136,10 +158,22 @@ class ContainerManager
 | 
			
		||||
            $args[] = $volumePath."/".$hint.":".$path;
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        $parsedEnv = [];
 | 
			
		||||
 | 
			
		||||
        // Prepared environment from serviceenvs
 | 
			
		||||
        $key = $serviceName . ":" . $instanceName;
 | 
			
		||||
        if (array_key_exists($key, $this->serverEnvs)) {
 | 
			
		||||
            foreach ($this->serverEnvs[$key] as $env=>$value) {
 | 
			
		||||
                $value = $this->expandString($value);
 | 
			
		||||
                array_push($args, "-e", sprintf("%s=%s", $env, $value));
 | 
			
		||||
                $parsedEnv[$env] = $value;
 | 
			
		||||
            }
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        // Get environment
 | 
			
		||||
        $envs = (array)($service['environment']??[]);
 | 
			
		||||
        $parsedEnv = [];
 | 
			
		||||
        foreach ($envs as $env=>$value) {
 | 
			
		||||
            if (array_key_exists($env, $parsedEnv)) continue;
 | 
			
		||||
            $args[] = '-e';
 | 
			
		||||
            $envval = getenv($env, true);
 | 
			
		||||
            if ($envval) $value = $envval;
 | 
			
		||||
@@ -153,6 +187,7 @@ class ContainerManager
 | 
			
		||||
        $cmdl = 'docker '.join(' ',array_map('escapeshellarg', $args));
 | 
			
		||||
        
 | 
			
		||||
        //echo "$ {$cmdl}\n";
 | 
			
		||||
 | 
			
		||||
        exec($cmdl, $out, $ret);
 | 
			
		||||
        if ($ret != 0) {
 | 
			
		||||
            echo join("\n",$out)."\n";
 | 
			
		||||
@@ -164,7 +199,8 @@ class ContainerManager
 | 
			
		||||
            'instance' => $instanceName,
 | 
			
		||||
            'environment' => $parsedEnv,
 | 
			
		||||
            'service' => $service,
 | 
			
		||||
            'ports' => $mappedPorts
 | 
			
		||||
            'ports' => $mappedPorts,
 | 
			
		||||
            'temporary' => $temporary,
 | 
			
		||||
        ]);
 | 
			
		||||
 | 
			
		||||
        return [
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user