Skip to content
This repository has been archived by the owner on May 3, 2021. It is now read-only.

Commit

Permalink
bumping to LTS v1.107.1 (#17)
Browse files Browse the repository at this point in the history
* bumping to LTS v1.107.1

* fix example scripts for LTS change
  • Loading branch information
sjqnn authored and JordanSussman committed Mar 19, 2018
1 parent 440579a commit 3d05895
Show file tree
Hide file tree
Showing 10 changed files with 18 additions and 14 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# changelog

## 2.107.1-1

* Bump LTS

## 2.89.4-1

* Bump LTS
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG JENKINS_VER=2.89.4
ARG JENKINS_VER=2.107.1

FROM jenkins/jenkins:${JENKINS_VER}

Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.debug
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG JENKINS_VER=2.89.4
ARG JENKINS_VER=2.107.1
ARG RELEASE=1

FROM target/jenkins-docker-master:${JENKINS_VER}-${RELEASE}
Expand Down
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
### Modify the image to company specific settings

```dockerfile
FROM target/jenkins-docker-master:2.89.4-1
FROM target/jenkins-docker-master:2.107.1-1
COPY scripts-directory /usr/share/jenkins/ref/init.groovy.d/script.groovy
```

Expand All @@ -21,7 +21,7 @@
docker service create --name <name> --mount type=bind,src=/path/to/source,dst=/var/jenkins_home
-e JENKINS_URL=https://<jenkins url> -e JENKINS_SLAVE_AGENT_PORT=<jnlp port>
--network <network name> --publish <jnlp port> --restart-condition on-failure
target/jenkins-docker-master:2.89.4-1
target/jenkins-docker-master:2.107.1-1
```

Example [gelvedere](https://github.com/target/gelvedere) command:
Expand Down Expand Up @@ -64,10 +64,10 @@ The following environment variables can be used to set up Jenkins:
The `jenkins-docker-master` images come in a couple of flavors, each designed for a specific use case. All of the images extend the official [Jenkins LTS images](https://hub.docker.com/r/jenkins/jenkins)
and as such, many of the options prescribed there apply to this image as well.
### `jenkins-docker-master:2.89.4-1`
### `jenkins-docker-master:2.107.1-1`
This is the de facto image. It is based off of `jenkins/jenkins:2.89.4` and includes a few modifications. It was created with the intention to be extended by using groovy scripts to setup ACLs using various plugins and as such, we have provided example groovy scripts [here](https://github.com/target/jenkins-docker-master/blob/master/examples).
This is the de facto image. It is based off of `jenkins/jenkins:2.107.1` and includes a few modifications. It was created with the intention to be extended by using groovy scripts to setup ACLs using various plugins and as such, we have provided example groovy scripts [here](https://github.com/target/jenkins-docker-master/blob/master/examples).
### `jenkins-docker-master:debug-2.89.4-1`
### `jenkins-docker-master:debug-2.107.1-1`
This image is based off of the `jenkins-docker-master:2.89.4-1` image. The noticeable difference is in relation to increasing log verbosity for troubleshooting.
This image is based off of the `jenkins-docker-master:2.107.1-1` image. The noticeable difference is in relation to increasing log verbosity for troubleshooting.
2 changes: 1 addition & 1 deletion examples/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG JENKINS_VER=2.89.4
ARG JENKINS_VER=2.107.1
ARG RELEASE=1

FROM target/jenkins-docker-master:${JENKINS_VER}-${RELEASE}
Expand Down
2 changes: 1 addition & 1 deletion examples/files/jenkins_wrapper.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash

JENKINS_VER=2.89.4
JENKINS_VER=2.107.1
RELEASE=1

# This enables you to directly tie versions of plugins to a specific version of Jenkins
Expand Down
2 changes: 1 addition & 1 deletion examples/files/setup_reporting.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import jenkins.metrics.impl.graphite.GraphiteServer
def env = System.getenv()
def logger = LogManager.getLogManager().getLogger("hudson.WebAppMain")

def instance = Jenkins.getInstance()
def instance = Jenkins.get()

logger.info("Setting up Graphite Metrics Reporting")

Expand Down
2 changes: 1 addition & 1 deletion examples/files/setup_security.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import com.cloudbees.plugins.credentials.domains.Domain
def env = System.getenv()
def logger = LogManager.getLogManager().getLogger("hudson.WebAppMain")

def instance = Jenkins.getInstance()
def instance = Jenkins.get()

// Set executors to 0
instance.setNumExecutors(0)
Expand Down
2 changes: 1 addition & 1 deletion files/jenkins_wrapper.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash

JENKINS_VER=2.89.4
JENKINS_VER=2.107.1
RELEASE=1

# This enables you to directly tie versions of plugins to a specific version of Jenkins
Expand Down
2 changes: 1 addition & 1 deletion update.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash
# This is a simple script to update the version of jenkins being used

JENKINS_VER=2.89.4
JENKINS_VER=2.107.1
RELEASE=1

for fname in Dockerfile Dockerfile.debug files/jenkins_wrapper.sh examples/Dockerfile examples/files/jenkins_wrapper.sh
Expand Down

0 comments on commit 3d05895

Please sign in to comment.