Skip to content
This repository has been archived by the owner on Jan 21, 2024. It is now read-only.

Commit

Permalink
Merge branch 'master' into alpine
Browse files Browse the repository at this point in the history
# Conflicts:
#	Dockerfile
  • Loading branch information
oleg-nenashev committed May 31, 2019
2 parents 7232646 + 845b908 commit fe652e8
Show file tree
Hide file tree
Showing 3 changed files with 36 additions and 2 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.

FROM jenkins/slave:alpine
FROM jenkins/slave:3.29-2-alpine
MAINTAINER Oleg Nenashev <o.v.nenashev@gmail.com>
LABEL Description="This is a base image, which allows connecting Jenkins agents via JNLP protocols" Vendor="Jenkins project" Version="3.27"
LABEL Description="This is a base image, which allows connecting Jenkins agents via JNLP protocols" Vendor="Jenkins project" Version="3.29"

COPY jenkins-slave /usr/local/bin/jenkins-slave

Expand Down
29 changes: 29 additions & 0 deletions Jenkinsfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
/* NOTE: this Pipeline mainly aims at catching mistakes (wrongly formed Dockerfile, etc.)
* This Pipeline is *not* used for actual image publishing.
* This is currently handled through Automated Builds using standard Docker Hub feature
*/
pipeline {
agent { label 'linux' }

options {
timeout(time: 2, unit: 'MINUTES')
buildDiscarder(logRotator(daysToKeepStr: '10'))
timestamps()
}

triggers {
pollSCM('H/24 * * * *') // once a day in case some hooks are missed
}

stages {
stage('Build Docker Image') {
steps {
deleteDir()
checkout scm
sh 'make build'
}
}
}
}

// vim: ft=groovy
5 changes: 5 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
ROOT:=$(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
IMAGE_NAME:=jenkins4eval/jnlp-slave:test

build:
docker build -t ${IMAGE_NAME} .

0 comments on commit fe652e8

Please sign in to comment.