Skip to content

Commit

Permalink
Add new jenkins agent (#10)
Browse files Browse the repository at this point in the history
  • Loading branch information
snovikov authored Apr 2, 2024
1 parent 5777f76 commit bf930dc
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ARG JENKINS_SLAVE
FROM jenkins/jnlp-slave:${JENKINS_SLAVE}
ARG JENKINS_AGENT
FROM jenkins/inbound-agent:${JENKINS_AGENT}
USER root

ARG PYTHON_MAJOR
Expand Down
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -10,19 +10,19 @@ IMAGE = flaconi/jnlp-slave-py
TAG = latest

# Base image version
JENKINS_SLAVE = 4.13.3-1-jdk11
JENKINS_AGENT = 3206.vb_15dcf73f6a_9-9

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

pull:
docker pull $(shell grep FROM Dockerfile | sed 's/^FROM//g' | sed "s/\$${JENKINS_SLAVE}/$(JENKINS_SLAVE)/g";)
docker pull $(shell grep FROM Dockerfile | sed 's/^FROM//g' | sed "s/\$${JENKINS_AGENT}/$(JENKINS_AGENT)/g";)

build:
docker build \
--network=host \
--build-arg JENKINS_SLAVE=$(JENKINS_SLAVE) \
--build-arg JENKINS_AGENT=$(JENKINS_AGENT) \
--build-arg PYTHON_MAJOR=$(PYTHON_MAJOR) \
--build-arg PYTHON_PATCH=$(PYTHON_PATCH) \
-t $(IMAGE) -f $(DIR)/$(FILE) $(DIR)
Expand Down

0 comments on commit bf930dc

Please sign in to comment.