Updated demo.

Author: jglick

demo/Dockerfile

@@ -1,4 +1,4 @@
-FROM jenkinsci/jenkins:2.73.1
+FROM jenkinsci/jenkins:2.89.2
 
 USER root
 
@@ -8,6 +8,16 @@ RUN wget -q -O /tmp/ngrok.zip https://bin.equinox.io/c/4VmDzA7iaHb/ngrok-stable-
     unzip /tmp/ngrok.zip && \
     rm /tmp/ngrok.zip
 
+ENV DOCKER_BUCKET get.docker.com
+ENV DOCKER_VERSION 1.12.6
+RUN set -x \
+    && curl -fSL "https://${DOCKER_BUCKET}/builds/Linux/x86_64/docker-$DOCKER_VERSION.tgz" -o docker.tgz \
+    && tar -xzvf docker.tgz \
+    && mv docker/* /usr/local/bin/ \
+    && rmdir docker \
+    && rm docker.tgz \
+    && docker -v
+
 COPY plugins /usr/share/jenkins/ref/plugins
 RUN chown -R jenkins.jenkins /usr/share/jenkins/ref/plugins
 

demo/Makefile

@@ -1,6 +1,6 @@
 IMAGE=jenkinsci/pipeline-as-code-github-demo
 TAG=$(shell date -I -u)
-DOCKER_RUN=docker run --rm -p 8080:8080 -p 4040:4040 -v $(shell which docker):/usr/bin/docker -v /var/run/docker.sock:/var/run/docker.sock --group-add=$(shell stat -c %g /var/run/docker.sock) -ti
+DOCKER_RUN=docker run --rm -p 8080:8080 -p 4040:4040 -v /var/run/docker.sock:/var/run/docker.sock --group-add=$(shell stat -c %g /var/run/docker.sock) -ti
 
 copy-plugins:
 	set -e; \

demo/README.md

@@ -4,7 +4,7 @@ To run the demo:
 
 1. Start the image:
   * from sources: `make run`
-  * from binaries: `docker run --rm -p 8080:8080 -p 4040:4040 -v $(which docker):/usr/bin/docker -v /var/run/docker.sock:/var/run/docker.sock --group-add=$(stat -c %g /var/run/docker.sock) -ti jenkinsci/pipeline-as-code-github-demo`
+  * from binaries: `docker run --rm -p 8080:8080 -p 4040:4040 -v /var/run/docker.sock:/var/run/docker.sock --group-add=$(stat -c %g /var/run/docker.sock) -ti jenkinsci/pipeline-as-code-github-demo`
 1. Visit [localhost:8080](http://localhost:8080/).
 1. Prepare your environment in GitHub:
   1. Create an organization or user account (or use an existing one)
@@ -14,10 +14,10 @@ To run the demo:
   1. Configure a personal access token with these scopes: `repo:status` and `public_repo` 
 1. Create a new item, selecting _GitHub Organization_ as the type, and setting the name to your account or organization name (for example, `cloudbeers`).
 1. Select your credentials token under _Scan Credentials_
-1. Optionally set the repository pattern to `multibranch.*`
+1. Optionally add the **Filter by name (with wildcards)** option, **Include**ing `multibranch-demo`.
 1. _Save_; you will see repositories being scanned.
 1. Go back to the organization index page. You should see `multibranch-demo`, under that one or more branches including `master`, and under each a successful build #1
-1. Add a new webhook, ask to _Send me *everything*_, and specify a URL like `http://SOMETHING.ngrok.io/github-webhook/` (look at the Docker log for the specific hostname). Remember to clean up your webhook when the demo is done
+1. Add a new webhook, ask to _Send me *everything*_, and specify a URL like `https://SOMETHING.ngrok.io/github-webhook/` (look at the Docker log for the specific hostname). Remember to clean up your webhook when the demo is done
 1. File pull requests (from a forked repository, not from origin branches) and see them being built.
 
 The image needs to run Docker commands, so it assumes that your Docker daemon is listening to `/var/run/docker.sock` ([discussion](https://github.com/docker/docker/issues/1143)). This is not “Docker-in-Docker”; the container only runs the CLI and connects back to the host to start sister containers. The `run` target also makes reference to file paths on the Docker host, assuming they are where you are running that command, so this target *cannot work* on boot2docker. There may be some way to run this demo using boot2docker; if so, please contribute it.

demo/plugins.txt

@@ -1,48 +1,50 @@
 org.jenkins-ci.ui:ace-editor:1.1
+org.jenkins-ci.plugins:apache-httpcomponents-client-4-api:4.5.3-2.0
 org.jenkins-ci.plugins:authentication-tokens:1.3
-org.jenkins-ci.plugins:branch-api:2.0.10
-org.jenkins-ci.plugins:cloudbees-folder:6.0.4
-org.jenkins-ci.plugins:credentials:2.1.14
-org.jenkins-ci.plugins:credentials-binding:1.12
-org.jenkins-ci.plugins:display-url-api:2.0
-org.jenkins-ci.plugins:docker-commons:1.7
-org.jenkins-ci.plugins:docker-workflow:1.12
-org.jenkins-ci.plugins:durable-task:1.14
-org.jenkins-ci.plugins:git-client:2.4.6
+org.jenkins-ci.plugins:branch-api:2.0.17
+org.jenkins-ci.plugins:cloudbees-folder:6.2.1
+org.jenkins-ci.plugins:credentials:2.1.16
+org.jenkins-ci.plugins:credentials-binding:1.13
+org.jenkins-ci.plugins:display-url-api:2.2.0
+org.jenkins-ci.plugins:docker-commons:1.10
+org.jenkins-ci.plugins:docker-workflow:1.14
+org.jenkins-ci.plugins:durable-task:1.17
+org.jenkins-ci.plugins:git-client:2.7.0
 org.jenkins-ci.plugins:git-server:1.7
-org.jenkins-ci.plugins:git:3.3.1
-com.coravy.hudson.plugins.github:github:1.27.0
-org.jenkins-ci.plugins:github-api:1.85.1
-org.jenkins-ci.plugins:github-branch-source:2.0.6
+org.jenkins-ci.plugins:git:3.7.0
+com.coravy.hudson.plugins.github:github:1.28.1
+org.jenkins-ci.plugins:github-api:1.90
+org.jenkins-ci.plugins:github-branch-source:2.3.2
 org.jenkins-ci.ui:handlebars:1.1.1
 org.jenkins-ci.plugins.icon-shim:icon-shim:2.0.3
-org.jenkins-ci.plugins:jackson2-api:2.7.3
+org.jenkins-ci.plugins:jackson2-api:2.8.10.1
 org.jenkins-ci.ui:jquery-detached:1.2.1
-org.jenkins-ci.plugins:junit:1.20
+org.jenkins-ci.plugins:jsch:0.1.54.1
+org.jenkins-ci.plugins:junit:1.23
 org.jenkins-ci.ui:momentjs:1.1.1
 org.jenkins-ci.plugins:mailer:1.20
-org.jenkins-ci.plugins:matrix-project:1.11
-org.jenkins-ci.plugins:pipeline-build-step:2.5
+org.jenkins-ci.plugins:matrix-project:1.12
+org.jenkins-ci.plugins:pipeline-build-step:2.6
 org.jenkins-ci.plugins:pipeline-github-lib:1.0
-org.jenkins-ci.plugins:pipeline-graph-analysis:1.4
-org.jenkins-ci.plugins:pipeline-input-step:2.7
+org.jenkins-ci.plugins:pipeline-graph-analysis:1.6
+org.jenkins-ci.plugins:pipeline-input-step:2.8
 org.jenkins-ci.plugins:pipeline-milestone-step:1.3.1
-org.jenkins-ci.plugins:pipeline-stage-step:2.2
-org.jenkins-ci.plugins.pipeline-stage-view:pipeline-stage-view:2.8
-org.jenkins-ci.plugins.pipeline-stage-view:pipeline-rest-api:2.8
+org.jenkins-ci.plugins:pipeline-stage-step:2.3
+org.jenkins-ci.plugins.pipeline-stage-view:pipeline-stage-view:2.9
+org.jenkins-ci.plugins.pipeline-stage-view:pipeline-rest-api:2.9
 org.jenkins-ci.plugins:plain-credentials:1.4
-org.jenkins-ci.plugins:scm-api:2.1.1
-org.jenkins-ci.plugins:script-security:1.29
+org.jenkins-ci.plugins:scm-api:2.2.6
+org.jenkins-ci.plugins:script-security:1.39
 org.jenkins-ci.plugins:ssh-credentials:1.13
-org.jenkins-ci.plugins:structs:1.9
-org.jenkins-ci.plugins:token-macro:2.1
-org.jenkins-ci.plugins.workflow:workflow-api:2.17
-org.jenkins-ci.plugins.workflow:workflow-basic-steps:2.5
-org.jenkins-ci.plugins.workflow:workflow-cps-global-lib:2.8
-org.jenkins-ci.plugins.workflow:workflow-cps:2.36
-org.jenkins-ci.plugins.workflow:workflow-durable-task-step:2.12
-org.jenkins-ci.plugins.workflow:workflow-job:2.12.1
+org.jenkins-ci.plugins:structs:1.10
+org.jenkins-ci.plugins:token-macro:2.3
+org.jenkins-ci.plugins.workflow:workflow-api:2.24
+org.jenkins-ci.plugins.workflow:workflow-basic-steps:2.6
+org.jenkins-ci.plugins.workflow:workflow-cps-global-lib:2.9
+org.jenkins-ci.plugins.workflow:workflow-cps:2.42
+org.jenkins-ci.plugins.workflow:workflow-durable-task-step:2.17
+org.jenkins-ci.plugins.workflow:workflow-job:2.16
 org.jenkins-ci.plugins.workflow:workflow-multibranch:2.16
 org.jenkins-ci.plugins.workflow:workflow-scm-step:2.6
-org.jenkins-ci.plugins.workflow:workflow-step-api:2.11
-org.jenkins-ci.plugins.workflow:workflow-support:2.14
+org.jenkins-ci.plugins.workflow:workflow-step-api:2.14
+org.jenkins-ci.plugins.workflow:workflow-support:2.16