Skip to content

Commit 1f672d8

Browse files
committed
Merge branch 'master' of github.com:jenkinsci/docker-workflow-plugin into CustomDescribableModel-JENKINS-44892
2 parents cdf8d63 + ae49bf8 commit 1f672d8

File tree

212 files changed

+4913
-6719
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

212 files changed

+4913
-6719
lines changed

.github/release-drafter.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# https://github.com/jenkinsci/.github/blob/master/.github/release-drafter.adoc
2+
_extends: .github
3+
tag-template: docker-workflow-$NEXT_MINOR_VERSION

Jenkinsfile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
1-
buildPlugin()
2-
1+
buildPlugin(platforms: [
2+
'linux',
3+
'maven-windows' // TODO Docker-based tests fail when using Docker on Windows. The maven-windows agents do not have Docker installed so tests that require Docker are skipped.
4+
])

README.md

Lines changed: 11 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
Docker Pipeline Plugin
22
=====================================
33

4+
[![Jenkins Plugin](https://img.shields.io/jenkins/plugin/v/docker-workflow.svg)](https://plugins.jenkins.io/docker-workflow)
5+
[![GitHub release](https://img.shields.io/github/release/jenkinsci/docker-workflow-plugin.svg?label=changelog)](https://github.com/jenkinsci/docker-workflow-plugin/releases/latest)
6+
[![Jenkins Plugin Installs](https://img.shields.io/jenkins/plugin/i/docker-workflow.svg?color=blue)](https://plugins.jenkins.io/docker-workflow)
7+
48
Jenkins plugin which allows building, testing, and using Docker images from Jenkins Pipeline projects.
59

610
Summary
@@ -10,26 +14,14 @@ A full description is available in the plugin’s [documentation](https://go.clo
1014

1115
Demo
1216
---
13-
The plugin has a Docker-based demo. See the [demo README](demo/README.md) page for setup and launch guidelines.
14-
15-
Releasing
16-
---
17-
18-
Prior to release, edit `demo/plugins.txt` to use the snapshot version and run:
19-
20-
mvn -DskipTests clean install
21-
make -C demo run
22-
23-
and verify that the demo works.
24-
25-
After the Maven release completes, update the `docker-workflow` version in `demo/plugins.txt` to the release version and run
26-
27-
make -C demo run
28-
29-
to sanity check, then
30-
31-
make -C demo push-latest
17+
The plugin has an outdated Docker-based demo. See the [demo README from v1.12](https://github.com/jenkinsci/docker-workflow-plugin/tree/docker-workflow-1.12/demo) for setup and launch guidelines.
3218

3319
License
3420
---
3521
[MIT License](http://opensource.org/licenses/MIT)
22+
23+
Changelog
24+
---
25+
26+
* For new versions, see [GitHub Releases](https://github.com/jenkinsci/docker-workflow-plugin/releases)
27+
* For versions 1.19 and older, see the [plugin's Wiki page](https://wiki.jenkins.io/display/JENKINS/Docker+Pipeline+Plugin)

demo/.gitignore

Lines changed: 0 additions & 2 deletions
This file was deleted.

demo/Dockerfile

Lines changed: 0 additions & 60 deletions
This file was deleted.

demo/Dockerfile-registry

Lines changed: 0 additions & 7 deletions
This file was deleted.

demo/JENKINS_HOME/config.xml

Lines changed: 0 additions & 34 deletions
This file was deleted.

demo/JENKINS_HOME/credentials.xml

Lines changed: 0 additions & 19 deletions
This file was deleted.

demo/JENKINS_HOME/jobs/docker-workflow/config.xml

Lines changed: 0 additions & 26 deletions
This file was deleted.

demo/JENKINS_HOME/jobs/puller/config.xml

Lines changed: 0 additions & 27 deletions
This file was deleted.

0 commit comments

Comments
 (0)