Branch: refs/heads/master Home: https://github.com/jenkinsci/docker-plugin Commit: 02397d4faf0cbf729d4d25867768e7c9052aec18 https://github.com/jenkinsci/docker-plugin/commit/02397d4faf0cbf729d4d25867768e7c9052aec18 Author: Peter Darton <pjdar...@gmail.com> Date: 2018-02-13 (Tue, 13 Feb 2018)
Changed paths: A src/main/java/io/jenkins/docker/client/ListContainersCmdExec.java M src/main/java/io/jenkins/docker/client/NettyDockerCmdExecFactory.java Log Message: ----------- BugFix: docker-java's Netty ListContainers depends on Jersey code. The docker-java ListContainersCmdExec class used by the NettyDockerCmdExecFactory calls upon Jersey functionality to implement the filter. This results in a classloading exception at runtime as we're using Netty, and not Jersey. This error is repeated in a number of xxxCmdExec classes, but this commit only fixes it for the ListContainers command as that's the only one we need fixed right now. Commit: fe3dc03631753ab9ebc1fd54c0f80a01f5d61e5d https://github.com/jenkinsci/docker-plugin/commit/fe3dc03631753ab9ebc1fd54c0f80a01f5d61e5d Author: Peter Darton <pjdar...@gmail.com> Date: 2018-02-13 (Tue, 13 Feb 2018) Changed paths: M src/main/java/com/nirima/jenkins/plugins/docker/DockerCloud.java M src/main/java/com/nirima/jenkins/plugins/docker/DockerTemplate.java M src/main/java/com/nirima/jenkins/plugins/docker/DockerTemplateBase.java Log Message: ----------- Functionality change: Instance counts now only count our own. Previously, the plugin called the docker API (twice), asking for details of all running docker containers. In situations where it's talking to a busy (shared) docker swarm, this sometimes returned over a megabyte of data causing the API call to fail (the docker-java library can only handle a maximum of 1meg of returned data). With this change, we now only call the docker API to ask about our own containers (using a label filter), greatly reducing the amount of data returned in shared situations, and we avoid calling the docker API at all if we do not have instance limits set. i.e. smaller docker calls, less often. This does now mean that per-cloud instance limits only count the containers run by "our Jenkins instance" on that cloud, and no longer counts containers run by other Jenkins instances on the same docker. Commit: d6c1d65696eeaf4cc8ba72b5811046ecbacd8e92 https://github.com/jenkinsci/docker-plugin/commit/d6c1d65696eeaf4cc8ba72b5811046ecbacd8e92 Author: Peter Darton <pjdar...@gmail.com> Date: 2018-02-13 (Tue, 13 Feb 2018) Changed paths: M src/test/java/com/nirima/jenkins/plugins/docker/DockerCloudTest.java Log Message: ----------- Unit test Added unit-test for the reworked code that counts the number of containers that are in the process of being spun up. Compare: https://github.com/jenkinsci/docker-plugin/compare/78e1c21469c9...d6c1d65696ee -- You received this message because you are subscribed to the Google Groups "Jenkins Commits" group. To unsubscribe from this group and stop receiving emails from it, send an email to jenkinsci-commits+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/d/optout.