michaelneale jamesdumay

Do you guys have any suggestions for the syntax?

hrmpw abayer I think the agent syntax was made flexible enough to cater for this.

agent docker:"foo" registry:

would something like that work? or the docker item take a block in that case with all the config needed? (Andrew would be able to comment on what is best)

Hrm. I don't like the idea of mixing closures with string values in the agent config. That ship has already sailed, I think. I'll play around with it, but I don't think it'll work well. Most likely, we'll need straight key/value pairings.

Ok, turns out it's technically possible, but I'm really unsure about the syntactic feel.

I tell a lie - there's no viable way to fit closure agent values into the AST. Grr. We could do maps, though. So I'd lean towards this syntax:

agent docker:'foo', registry:[url:'http://...', username:'...', password:'...']

Still need to think how we'd fit credentials into that, though.

that looks reasonable. I am not aware how registry works today with withCredentials, but perhaps its a matter of takign a credentialId as an option?

Current syntax looks like this withDockerRegistry([credentialsId: 'foo', url: 'https://docker.foo.com']).
Tried to add it as wrapper but obviously that didn't work out.

Maybe the agent syntax always needs to be a closure, away from strings.
In the future there might be a lot of parameters for different kinds of agents.

pleibiger I know abayer was looking at making the agent syntax more extensible: https://github.com/jenkinsci/pipeline-model-definition-plugin/pull/73 - so perhaps that is the place to add in registry support?

Preliminary PR up at https://github.com/jenkinsci/pipeline-model-definition-plugin/pull/86

I can probably test this sometime this week.

Code changed in jenkins
User: Andrew Bayer
Path:
pipeline-model-definition/src/main/java/org/jenkinsci/plugins/pipeline/modeldefinition/agent/impl/DockerPipeline.java
pipeline-model-definition/src/main/java/org/jenkinsci/plugins/pipeline/modeldefinition/agent/impl/DockerPipelineFromDockerfile.java
pipeline-model-definition/src/main/resources/org/jenkinsci/plugins/pipeline/modeldefinition/agent/impl/DockerPipelineFromDockerfileScript.groovy
pipeline-model-definition/src/main/resources/org/jenkinsci/plugins/pipeline/modeldefinition/agent/impl/DockerPipelineScript.groovy
http://jenkins-ci.org/commit/pipeline-model-definition-plugin/d76175b8b7d302fe46cccfda2bca36eb9f857974
Log:
[FIXED JENKINS-39684] Add registryUrl and registryCredentialsId

Added to both docker and dockerfile agent types. Not sure how to test
this, honestly.

Works for me.

For the benefit of anyone else who discovers this in future wondering what the syntax should actually look like altogether, example given below:

agent {
  docker {
    label 'docker'
    image 'myregistry.com/node:7.10.0'
    registryUrl 'https://myregistry.com/'
    registryCredentialsId 'myPredefinedCredentialsInJenkins'
  }
}

Hello,

this is a great feature but I could not find documentation/exemple.

I looked here:

• https://github.com/jenkinsci/pipeline-model-definition-plugin/wiki
• https://jenkins.io/doc/
• https://www.google.fr/search?q=jenkins+pipeline+additionalBuildArgs

The resolved dependent issue (JENKINS-40524) does add the registryUrl and registryCredentialsId, but what is the mechanism to push a tag into the registry upon success?

jraub_switch Feel free to open a new issue for that.

Bulk closing resolved issues.