Skip to content

Commit

Permalink
Minor update (#11)
Browse files Browse the repository at this point in the history
* Pin agent to Java17

* Update pip to the latest

* Update python3.11

* Update docs

* Fix Makefile

* Remove python versions with `end-of-life`
  • Loading branch information
snovikov authored Apr 4, 2024
1 parent bf930dc commit 2bdc0ed
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 10 deletions.
5 changes: 1 addition & 4 deletions .github/workflows/docker-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,10 @@ jobs:
fail-fast: false
matrix:
PYTHON:
- 3.5.10
- 3.6.15
- 3.7.17
- 3.8.19
- 3.9.19
- 3.10.14
- 3.11.8
- 3.11.9
- 3.12.2
steps:
- name: Checkout repository
Expand Down
3 changes: 2 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,10 @@ RUN export PYTHON_SEMVER="${PYTHON_MAJOR}.${PYTHON_PATCH}" \
&& cd Python-${PYTHON_SEMVER} \
&& ./configure --enable-optimizations --with-ensurepip \
&& make altinstall \
&& pip${PYTHON_MAJOR} install six \
&& ln -s /usr/local/bin/python${PYTHON_MAJOR} /usr/local/bin/python3 \
&& ln -s /usr/local/bin/pip${PYTHON_MAJOR} /usr/local/bin/pip \
&& pip install --upgrade pip \
&& pip install six \
# Clean up
&& apt-get remove -f -y --purge --auto-remove build-essential \
&& apt-get clean \
Expand Down
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ FILE = Dockerfile
IMAGE = flaconi/jnlp-slave-py
TAG = latest

# Base image version
JENKINS_AGENT = 3206.vb_15dcf73f6a_9-9
# Base image version: https://github.com/jenkinsci/docker-agent/releases/latest
JENKINS_AGENT = 3206.vb_15dcf73f6a_9-9-jdk17

# Python versions: $PYTHON_MAJOR.PYTHON_PATCH
# Python versions: $PYTHON_MAJOR.$PYTHON_PATCH
PYTHON_MAJOR = 3.12
PYTHON_PATCH = 2

Expand Down
8 changes: 6 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,2 +1,6 @@
# docker-jnlp-slave-py
A Jenkins agent which can connect to Jenkins using JNLP4 + python
# Jenkins Agent and python

[![GitHub release](https://img.shields.io/github/release/flaconi/docker-jnlp-slave-py.svg?label=changelog)](https://github.com/flaconi/docker-jnlp-slave-py/releases/latest)
[![Docker Pulls](https://img.shields.io/docker/pulls/flaconi/jnlp-slave-py.svg)](https://hub.docker.com/r/flaconi/jnlp-slave-py/)

A Jenkins agent which can connect to Jenkins using JNLP4 + python preinstalled

0 comments on commit 2bdc0ed

Please sign in to comment.