fix: service env variable ovewritten if it has a default value
This commit is contained in:
		@@ -969,10 +969,6 @@ function parseDockerComposeFile(Service|Application $resource, bool $isNew = fal
 | 
				
			|||||||
                                }
 | 
					                                }
 | 
				
			||||||
                            }
 | 
					                            }
 | 
				
			||||||
                        } else {
 | 
					                        } else {
 | 
				
			||||||
                            $foundEnv = EnvironmentVariable::where([
 | 
					 | 
				
			||||||
                                'key' => $key,
 | 
					 | 
				
			||||||
                                'service_id' => $resource->id,
 | 
					 | 
				
			||||||
                            ])->first();
 | 
					 | 
				
			||||||
                            if ($value->contains(':-')) {
 | 
					                            if ($value->contains(':-')) {
 | 
				
			||||||
                                $key = $value->before(':');
 | 
					                                $key = $value->before(':');
 | 
				
			||||||
                                $defaultValue = $value->after(':-');
 | 
					                                $defaultValue = $value->after(':-');
 | 
				
			||||||
@@ -989,6 +985,10 @@ function parseDockerComposeFile(Service|Application $resource, bool $isNew = fal
 | 
				
			|||||||
                                $key = $value;
 | 
					                                $key = $value;
 | 
				
			||||||
                                $defaultValue = null;
 | 
					                                $defaultValue = null;
 | 
				
			||||||
                            }
 | 
					                            }
 | 
				
			||||||
 | 
					                            $foundEnv = EnvironmentVariable::where([
 | 
				
			||||||
 | 
					                                'key' => $key,
 | 
				
			||||||
 | 
					                                'service_id' => $resource->id,
 | 
				
			||||||
 | 
					                            ])->first();
 | 
				
			||||||
                            if ($foundEnv) {
 | 
					                            if ($foundEnv) {
 | 
				
			||||||
                                $defaultValue = data_get($foundEnv, 'value');
 | 
					                                $defaultValue = data_get($foundEnv, 'value');
 | 
				
			||||||
                            }
 | 
					                            }
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -7,7 +7,7 @@ return [
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
    // The release version of your application
 | 
					    // The release version of your application
 | 
				
			||||||
    // Example with dynamic git hash: trim(exec('git --git-dir ' . base_path('.git') . ' log --pretty="%h" -n1 HEAD'))
 | 
					    // Example with dynamic git hash: trim(exec('git --git-dir ' . base_path('.git') . ' log --pretty="%h" -n1 HEAD'))
 | 
				
			||||||
    'release' => '4.0.0-beta.159',
 | 
					    'release' => '4.0.0-beta.160',
 | 
				
			||||||
    // When left empty or `null` the Laravel environment will be used
 | 
					    // When left empty or `null` the Laravel environment will be used
 | 
				
			||||||
    'environment' => config('app.env'),
 | 
					    'environment' => config('app.env'),
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,3 +1,3 @@
 | 
				
			|||||||
<?php
 | 
					<?php
 | 
				
			||||||
 | 
					
 | 
				
			||||||
return '4.0.0-beta.159';
 | 
					return '4.0.0-beta.160';
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -4,7 +4,7 @@
 | 
				
			|||||||
            "version": "3.12.36"
 | 
					            "version": "3.12.36"
 | 
				
			||||||
        },
 | 
					        },
 | 
				
			||||||
        "v4": {
 | 
					        "v4": {
 | 
				
			||||||
            "version": "4.0.0-beta.159"
 | 
					            "version": "4.0.0-beta.160"
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user