From b5e8667fe200665bd016cc1b94a508731802bb2f Mon Sep 17 00:00:00 2001 From: kev Date: Tue, 3 May 2016 14:05:55 +0800 Subject: [PATCH] update jenkins --- README.md | 3 +-- jenkins/Dockerfile | 28 ---------------------------- jenkins/README.md | 2 +- jenkins/arm/Dockerfile | 12 +++++++----- jenkins/arm/docker-compose.yml | 4 +++- jenkins/docker-compose.yml | 2 +- 6 files changed, 13 insertions(+), 38 deletions(-) delete mode 100644 jenkins/Dockerfile diff --git a/README.md b/README.md index 8d0d353..8c5bd82 100644 --- a/README.md +++ b/README.md @@ -54,7 +54,6 @@ dockerfiles - [x] influxdb - [x] iptables - [x] jamapi -- [x] jenkins - [x] jenkins-arm :beetle: - [x] joomla - [x] mantisbt @@ -122,7 +121,7 @@ dockerfiles - [ ] gliderlabs/logspout - [x] gliderlabs/registrator - [x] gogs :cn: -- [ ] jenkins +- [x] jenkins - [x] letsencrypt - [x] mongo - [x] neo4j diff --git a/jenkins/Dockerfile b/jenkins/Dockerfile deleted file mode 100644 index 24abfc8..0000000 --- a/jenkins/Dockerfile +++ /dev/null @@ -1,28 +0,0 @@ -# -# Dockerfile for jenkins -# - -FROM alpine -MAINTAINER kev - -ENV JENKINS_HOME /var/jenkins_home - -RUN set -xe \ - && apk add -U curl \ - openjdk8 \ - openssh-client \ - ttf-dejavu \ - && adduser -h $JENKINS_HOME -u 1000 -s /bin/sh -D jenkins \ - && mkdir -p /usr/share/jenkins \ - && cd /usr/share/jenkins \ - && wget http://mirrors.jenkins-ci.org/war/latest/jenkins.war \ - && rm -rf /var/cache/apk/* - -VOLUME $JENKINS_HOME -WORKDIR $JENKINS_HOME - -USER jenkins - -EXPOSE 8080 - -CMD ["java", "-Djava.awt.headless=true", "-jar", "/usr/share/jenkins/jenkins.war"] diff --git a/jenkins/README.md b/jenkins/README.md index db40756..589347c 100644 --- a/jenkins/README.md +++ b/jenkins/README.md @@ -18,7 +18,7 @@ jenkins: volumes: - ./data:/var/jenkins_home environment: - - JAVA_OPTS=-Dhudson.footerURL=http://easypi.info/ + - JAVA_OPTS=-Dhudson.footerURL=https://easypi.info/ restart: always ``` diff --git a/jenkins/arm/Dockerfile b/jenkins/arm/Dockerfile index 1404e03..22c3db6 100644 --- a/jenkins/arm/Dockerfile +++ b/jenkins/arm/Dockerfile @@ -2,17 +2,19 @@ # Dockerfile for jenkins-arm # -FROM vimagick/alpine-arm -MAINTAINER kev +FROM easypi/alpine-arm +MAINTAINER EasyPi Software Foundation ENV JENKINS_HOME /var/jenkins_home RUN set -xe \ - && apk add -U curl \ - openjdk7 \ + && apk add -U bash \ + curl \ + openjdk8 \ openssh-client \ ttf-dejavu \ - && adduser -h $JENKINS_HOME -u 1000 -s /bin/sh -D jenkins \ + && addgroup -g 1000 jenkins \ + && adduser -h $JENKINS_HOME -u 1000 -G jenkins -s /bin/bash -D jenkins \ && mkdir -p /usr/share/jenkins \ && cd /usr/share/jenkins \ && wget http://mirrors.jenkins-ci.org/war/latest/jenkins.war \ diff --git a/jenkins/arm/docker-compose.yml b/jenkins/arm/docker-compose.yml index d8e1c56..dcb6adf 100644 --- a/jenkins/arm/docker-compose.yml +++ b/jenkins/arm/docker-compose.yml @@ -1,5 +1,7 @@ jenkins: - image: vimagick/jenkins-arm + image: easypi/jenkins-arm ports: - "8080:8080" + volumes: + - ./data:/var/jenkins_home restart: always diff --git a/jenkins/docker-compose.yml b/jenkins/docker-compose.yml index aef89dd..014ef3f 100644 --- a/jenkins/docker-compose.yml +++ b/jenkins/docker-compose.yml @@ -6,5 +6,5 @@ jenkins: volumes: - ./data:/var/jenkins_home environment: - - JAVA_OPTS=-Dhudson.footerURL=http://easypi.info/ + - JAVA_OPTS=-Dhudson.footerURL=https://easypi.info/ restart: always