Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[JENKINS-32731] [JENKINS-34650] Docker.groovy is already trusted #75

Merged
merged 3 commits into from Oct 31, 2016

Conversation

Projects
None yet
4 participants
@jglick
Copy link
Member

commented Oct 17, 2016

See comment in JENKINS-32731. Can simplify this plugin as of jenkinsci/workflow-cps-plugin#33.

@reviewbybees

@reviewbybees

This comment has been minimized.

Copy link

commented Oct 17, 2016

This pull request originates from a CloudBees employee. At CloudBees, we require that all pull requests be reviewed by other CloudBees employees before we seek to have the change accepted. If you want to learn more about our process please see this explanation.

@abayer

This comment has been minimized.

Copy link
Member

commented Oct 31, 2016

🐝

@jglick jglick merged commit 223612b into jenkinsci:master Oct 31, 2016

1 check passed

Jenkins This pull request looks good
Details

@jglick jglick deleted the jglick:GlobalVariable-JENKINS-32731 branch Oct 31, 2016

@@ -50,13 +47,4 @@
return docker;
}

@Extension public static class MiscWhitelist extends ProxyWhitelist {

This comment has been minimized.

Copy link
@oleg-nenashev

oleg-nenashev Jul 10, 2017

Member

This class is unrestricted, could it cause regressions?

@@ -42,12 +40,9 @@

private static final long serialVersionUID = 1L;

@Whitelisted

This comment has been minimized.

Copy link
@oleg-nenashev

oleg-nenashev Jul 10, 2017

Member

Does not seem to be required. I would keep it explicitly

@@ -34,7 +34,7 @@ class Docker implements Serializable {
public <V> V withRegistry(String url, String credentialsId = null, Closure<V> body) {
node {
script.withEnv(["DOCKER_REGISTRY_URL=${url}"]) {
script.withDockerRegistry(registry: [url: url, credentialsId: credentialsId]) {

This comment has been minimized.

Copy link
@oleg-nenashev

oleg-nenashev Jul 10, 2017

Member

Will the original code work after the change?. Better to keep both tests

@@ -43,7 +43,7 @@ class Docker implements Serializable {

public <V> V withServer(String uri, String credentialsId = null, Closure<V> body) {
node {
script.withDockerServer(server: [uri: uri, credentialsId: credentialsId]) {

This comment has been minimized.

Copy link
@oleg-nenashev

oleg-nenashev Jul 10, 2017

Member

Better to keep the original test as well

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.