diff --git a/jenkins/README.md b/jenkins/README.md index f53041a..8e2ca81 100644 --- a/jenkins/README.md +++ b/jenkins/README.md @@ -3,24 +3,11 @@ jenkins ![](https://badge.imagelayers.io/jenkinsci/jenkins:latest.svg) -In a nutshell, [Jenkins][1] is the leading open source automation server. Built -with Java, it provides hundreds of plugins to support building, testing, -deploying and automation for virtually any project. +[Jenkins][1] is the leading open source automation server. Built with Java, +it provides hundreds of plugins to support building, testing, deploying and +automation for virtually any project. -## docker-compose.yml - -```yaml -jenkins: - image: jenkins/jenkins:lts-alpine - ports: - - "8080:8080" - - "50000:50000" - volumes: - - ./data:/var/jenkins_home - environment: - - JAVA_OPTS=-Dhudson.footerURL=http://jenkins.easypi.pro - restart: always -``` +Read [more](https://github.com/jenkinsci/docker) about this docker image. ## up and running @@ -37,18 +24,18 @@ $ docker-compose exec jenkins bash ...... >>> exit $ docker-compose exec --user root jenkins apk add -U git -$ firefox http://localhost:8080/ +$ curl http://localhost:8080/ ``` ## fix slow network -``` +```bash $ vim data/war/jsbundles/pluginSetupWizard.js // default 10 seconds for AJAX responses to return before triggering an error condition var pluginManagerErrorTimeoutMillis = 10 * 1000; ``` -> Chinese users may add `-Dhudson.model.DownloadService.noSignatureCheck=true` option to use [plugin update mirror site][2]. +> :cn: Chinese users may add `-Dhudson.model.DownloadService.noSignatureCheck=true` option to use [plugin update mirror site][2]. [1]: https://jenkins.io/index.html [2]: https://mirrors.tuna.tsinghua.edu.cn/jenkins/updates/current/update-center.json diff --git a/jenkins/agent/README.md b/jenkins/agent/README.md index 45064a2..95d3a7f 100644 --- a/jenkins/agent/README.md +++ b/jenkins/agent/README.md @@ -1,6 +1,11 @@ jenkins/inbound-agent ===================== +[inbound-agent][1] is for Jenkins agents using TCP or WebSockets to establish +inbound connection to the Jenkins controller. This agent is powered by the +Jenkins Remoting library, which version is being taken from the base Docker +Agent image. + ## how to - Enable TCP port 50000 for inbound agents: http://jenkins:8080/configureSecurity/ @@ -54,3 +59,5 @@ File: ~/.gitconfig [http "https://github.com"] proxy = http://x.x.x.x:8123 ``` + +[1]: https://hub.docker.com/r/jenkins/inbound-agent diff --git a/jenkins/agent/docker-compose.yml b/jenkins/agent/docker-compose.yml index 615bab4..f44d5f4 100644 --- a/jenkins/agent/docker-compose.yml +++ b/jenkins/agent/docker-compose.yml @@ -1,17 +1,16 @@ version: "3.8" - services: - - inbound-agent: - image: jenkins/inbound-agent + agent: + image: jenkins/inbound-agent:alpine-jdk21 init: true container_name: docker-inbound-agent volumes: - ./data:/home/jenkins - ./data/agent:/home/jenkins/agent environment: - - JENKINS_URL=http://jenkins.easypi.pro:8080 + - JENKINS_URL=http://jenkins.easypi.duckdns.org:8080 - JENKINS_SECRET=*************************** - JENKINS_AGENT_NAME=docker-inbound-agent - JENKINS_AGENT_WORKDIR=/home/jenkins/agent + - TZ=Etc/UTC restart: unless-stopped diff --git a/jenkins/arm/Dockerfile b/jenkins/arm/Dockerfile deleted file mode 100644 index 3195b07..0000000 --- a/jenkins/arm/Dockerfile +++ /dev/null @@ -1,34 +0,0 @@ -# -# Dockerfile for jenkins-arm -# - -FROM arm32v7/alpine:3 -MAINTAINER EasyPi Software Foundation - -ENV JENKINS_HOME /var/jenkins_home - -RUN set -xe \ - && apk add --no-cache \ - bash \ - coreutils \ - curl \ - git \ - openjdk8 \ - openssh-client \ - ttf-dejavu \ - unzip \ - zip \ - && 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 - -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/arm/README.md b/jenkins/arm/README.md deleted file mode 100644 index 32413d3..0000000 --- a/jenkins/arm/README.md +++ /dev/null @@ -1,4 +0,0 @@ -jenkins-arm -=========== - -WARNING: TOO SLOW, DO NOT USE! diff --git a/jenkins/arm/docker-compose.yml b/jenkins/arm/docker-compose.yml deleted file mode 100644 index dcb6adf..0000000 --- a/jenkins/arm/docker-compose.yml +++ /dev/null @@ -1,7 +0,0 @@ -jenkins: - 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 503bce3..4e8d85c 100644 --- a/jenkins/docker-compose.yml +++ b/jenkins/docker-compose.yml @@ -1,10 +1,12 @@ -jenkins: - image: jenkins/jenkins:lts-alpine - ports: - - "8080:8080" - - "50000:50000" - volumes: - - ./data:/var/jenkins_home - environment: - - JAVA_OPTS=-Dhudson.footerURL=http://jenkins.easypi.pro - restart: always +version: "3.8" +services: + jenkins: + image: jenkins/jenkins:lts-alpine-jdk21 + ports: + - "8080:8080" + - "50000:50000" + volumes: + - ./data:/var/jenkins_home + environment: + - JAVA_OPTS=-Dhudson.footerURL=http://jenkins.easypi.duckdns.org + restart: unless-stopped