forked from LaconicNetwork/kompose
Validate dockerfilepath in buildconfig
This PR will resolve #594 by validating dockerfilepath based on whether it is relative path or not.
This commit is contained in:
parent
2a708bcdcf
commit
581e181967
@ -330,6 +330,11 @@ func (c *Compose) LoadFile(files []string) (kobject.KomposeObject, error) {
|
||||
envs := loadEnvVars(composeServiceConfig.Environment)
|
||||
serviceConfig.Environment = envs
|
||||
|
||||
//Validate dockerfile path
|
||||
if filepath.IsAbs(serviceConfig.Dockerfile) {
|
||||
log.Fatalf("%q defined in service %q is an absolute path, it must be a relative path.", serviceConfig.Dockerfile, name)
|
||||
}
|
||||
|
||||
// load ports
|
||||
ports, err := loadPorts(composeServiceConfig.Ports)
|
||||
if err != nil {
|
||||
|
||||
@ -197,6 +197,8 @@ convert::expect_success_and_warning "kompose -f $KOMPOSE_ROOT/script/test/fixtur
|
||||
# Openshift Test
|
||||
convert::expect_success_and_warning "kompose --provider openshift -f $KOMPOSE_ROOT/script/test/fixtures/service-name-change/docker-compose.yml convert --stdout -j" "$KOMPOSE_ROOT/script/test/fixtures/service-name-change/output-os.json" "Unsupported root level volumes key - ignoring"
|
||||
|
||||
# Test regarding validating dockerfilepath
|
||||
convert::expect_failure "kompose -f $KOMPOSE_ROOT/script/test/fixtures/dockerfilepath/docker-compose.yml convert --stdout"
|
||||
|
||||
######
|
||||
# Test the output file behavior of kompose convert
|
||||
|
||||
8
script/test/fixtures/dockerfilepath/docker-compose.yml
vendored
Normal file
8
script/test/fixtures/dockerfilepath/docker-compose.yml
vendored
Normal file
@ -0,0 +1,8 @@
|
||||
version: "2"
|
||||
|
||||
services:
|
||||
foo:
|
||||
build:
|
||||
context: "../../script/test_in_openshift/buildconfig"
|
||||
dockerfile: "/Dockerfile"
|
||||
command: "sleep 120"
|
||||
Loading…
Reference in New Issue
Block a user