1
0
mirror of https://github.com/SAP/jenkins-library.git synced 2024-12-14 11:03:09 +02:00

Merge remote-tracking branch 'origin/master' into docuGen

This commit is contained in:
Sascha Vornheder 2019-11-18 08:35:42 +01:00
commit 4c00db7a66
2 changed files with 5 additions and 2 deletions

View File

@ -39,7 +39,10 @@ import groovy.transform.Field
*/
'dockerEnvVars',
/**
* Name of the docker image that should be used. If empty, Docker is not used and the command is executed directly on the Jenkins system.
* Name of the docker image that should be used.
* Configure with empty value to execute the command directly on the Jenkins system (not using a container).
* Omit to use the default image (cf. [default_pipeline_environment.yml](https://github.com/SAP/jenkins-library/blob/master/resources/default_pipeline_environment.yml))
* Overwrite to use custom Docker image.
*/
'dockerImage',
/**

View File

@ -31,7 +31,7 @@ import static com.sap.piper.Utils.downloadSettingsFromUrl
'extension',
/**
* The location of the SAP Multitarget Application Archive Builder jar file, including file name and extension.
* If it is not provided, the SAP Multitarget Application Archive Builder is expected on PATH.
* If you run on Docker, this must match the location of the jar file in the container as well.
*/
'mtaJarLocation',
/** Path or url to the mvn settings file that should be used as global settings file.*/