update jenkins

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

jenkins/Dockerfile

@@ -1,28 +0,0 @@
-#
-# Dockerfile for jenkins
-#
-
-FROM alpine
-MAINTAINER kev <noreply@easypi.info>
-
-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"]

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
 ```
 

jenkins/arm/Dockerfile

@@ -2,17 +2,19 @@
 # Dockerfile for jenkins-arm
 #
 
-FROM vimagick/alpine-arm
-MAINTAINER kev <noreply@easypi.info>
+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 \

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

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