Skip to content

Commit

Permalink
Upgrade Jenkins, Python, JDK (#8)
Browse files Browse the repository at this point in the history
* upgrade: Upgrade to python 3.11, Jenkins to 2.401.2 and agent to 4.14
* upgrade: Upgrade JDK version to 17
* upgrade: Update docs
  • Loading branch information
kwmlodozeniec committed Jul 17, 2023
1 parent 8edcc38 commit 2a9f2af
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 12 deletions.
8 changes: 4 additions & 4 deletions Dockerfile.template
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM balenalib/%%BALENA_MACHINE_NAME%%-python:3.10-buster-run
FROM balenalib/%%BALENA_MACHINE_NAME%%-python:3.11-bookworm-run

# Install base packages
RUN install_packages \
Expand All @@ -7,7 +7,7 @@ RUN install_packages \
curl \
git \
jq \
openjdk-11-jre-headless \
openjdk-17-jre-headless \
openssh-server \
vim \
wget \
Expand All @@ -27,8 +27,8 @@ COPY . ./
ENV UDEV=1

ENV JENKINS_HOME=/data/jenkins/
ENV JENKINS_VERSION=2.319.3
ENV AGENT_VERSION=4.9
ENV JENKINS_VERSION=2.401.2
ENV AGENT_VERSION=4.14

RUN mkdir -p /data/jenkins
RUN wget -q https://get.jenkins.io/war-stable/${JENKINS_VERSION}/jenkins.war
Expand Down
21 changes: 14 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,25 +1,32 @@
![GitHub Actions](https://github.com/kwmlodozeniec/balena-jenkins/workflows/Docker%20Image%20CI/badge.svg)

This is a basic Jenkins image with Python 3.7 and OpenJRE 11 preinstalled.
This is a basic Jenkins image with Python 3.11 and OpenJRE 17 preinstalled.
The device can run either as an agent or as a Jenkins master.
Click on the button below for a one click install on your Balena dashboard.

[![balena deploy button](https://www.balena.io/deploy.svg)](https://dashboard.balena-cloud.com/deploy?repoUrl=https://github.com/kwmlodozeniec/balena-jenkins)

# 🚨 Default SSH username and password

This image has a default user name and password configured in the Dockerfile. Please ensure this has been changed prior to using this image in any setting as it will be very insecure!

# ℹ️ Agent Configuraton

The following configuration variables need to be set on FLEET level:
* MASTER_IP
* MASTER_PORT
* SLAVE_WORK_DIR

- MASTER_IP
- MASTER_PORT
- SLAVE_WORK_DIR

The following configuration variables need to be set on DEVICE level:
* MASTER_SECRET
* SLAVE_NAME

- MASTER_SECRET
- SLAVE_NAME

# ℹ️ Master Configuration

The following configuration variable needs to be set on DEVICE level:
* RUN_MASTER (it can be set to any non empty value)

- RUN_MASTER (it can be set to any non empty value)

By default JENKINS_HOME is set to /data/jenkins directory as this is the data partition which persists between updates.
2 changes: 1 addition & 1 deletion balena.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: "Jenkins"
type: "sw.application"
description: "Build a Jenkins image with Python 3.7 and OpenJRE 11 preinstalled"
description: "Build a Jenkins image with Python 3.11 and OpenJRE 17 preinstalled"
joinable: false
assets:
repository:
Expand Down

0 comments on commit 2a9f2af

Please sign in to comment.