Skip to content

Commit 17419af

Browse files
committed
Remove README changes and update Makefile for Java 17/21 support
1 parent b71d8d3 commit 17419af

File tree

2 files changed

+12
-47
lines changed

2 files changed

+12
-47
lines changed

Makefile

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,35 @@
1-
JENKINS_REMOTING_TAG := latest-jdk11
1+
JENKINS_REMOTING_TAG := 4.13.2-1-jdk11
22
JOB := remoting-${JENKINS_REMOTING_TAG}
33
CLEAN_JOB := clean-${CORE_TAG}
44

55
# Default target builds Java 11 variant
6-
all: remoting-latest-jdk11 remoting-latest-jdk17 remoting-latest-jdk21
6+
all: remoting-4.13.2-1-jdk11 remoting-4.13.2-1-jdk17 remoting-4.13.2-1-jdk21
77

88
clean: ${CLEAN_JOB}
9-
.PHONY: all clean ${JOB} ${CLEAN_JOB} remoting-latest-jdk11 remoting-latest-jdk17 remoting-latest-jdk21
9+
.PHONY: all clean ${JOB} ${CLEAN_JOB} remoting-4.13.2-1-jdk11 remoting-4.13.2-1-jdk17 remoting-4.13.2-1-jdk21
1010

1111
${JOB}: remoting-%: Dockerfile
1212
docker build \
1313
--build-arg JENKINS_REMOTING_TAG=$* \
1414
--tag dwolla/jenkins-agent-core:$*-SNAPSHOT \
1515
.
1616

17-
remoting-latest-jdk11: Dockerfile
17+
remoting-4.13.2-1-jdk11: Dockerfile
1818
docker build \
19-
--build-arg JENKINS_REMOTING_TAG=latest-jdk11 \
20-
--tag dwolla/jenkins-agent-core:latest-jdk11-SNAPSHOT \
19+
--build-arg JENKINS_REMOTING_TAG=4.13.2-1-jdk11 \
20+
--tag dwolla/jenkins-agent-core:4.13.2-1-jdk11-SNAPSHOT \
2121
.
2222

23-
remoting-latest-jdk17: Dockerfile
23+
remoting-4.13.2-1-jdk17: Dockerfile
2424
docker build \
25-
--build-arg JENKINS_REMOTING_TAG=latest-jdk17 \
26-
--tag dwolla/jenkins-agent-core:latest-jdk17-SNAPSHOT \
25+
--build-arg JENKINS_REMOTING_TAG=4.13.2-1-jdk17 \
26+
--tag dwolla/jenkins-agent-core:4.13.2-1-jdk17-SNAPSHOT \
2727
.
2828

29-
remoting-latest-jdk21: Dockerfile
29+
remoting-4.13.2-1-jdk21: Dockerfile
3030
docker build \
31-
--build-arg JENKINS_REMOTING_TAG=latest-jdk21 \
32-
--tag dwolla/jenkins-agent-core:latest-jdk21-SNAPSHOT \
31+
--build-arg JENKINS_REMOTING_TAG=4.13.2-1-jdk21 \
32+
--tag dwolla/jenkins-agent-core:4.13.2-1-jdk21-SNAPSHOT \
3333
.
3434

3535
${CLEAN_JOB}: clean-%:

README.md

Lines changed: 0 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -7,38 +7,3 @@ Docker images containing the Jenkins remoting JAR and necessary dependencies.
77
GitHub Actions will build the Docker images for multiple supported architectures.
88

99
To build locally, run `make all` or `make remoting-${TAG}` for one of the supported tags.
10-
11-
## Privileged Token Support
12-
13-
This agent supports both regular and privileged tokens for Jenkins authentication. The agent will automatically use a privileged token if provided, with fallback to a regular token.
14-
15-
### Environment Variables
16-
17-
- `JENKINS_PRIVILEGED_SECRET` - Privileged token (takes priority if set)
18-
- `JENKINS_SECRET` - Regular token (used if privileged token not provided)
19-
- `JENKINS_URL` - Jenkins controller URL (required)
20-
- `JENKINS_AGENT_NAME` - Agent name (optional)
21-
22-
### Usage
23-
24-
For privileged builds, provide the privileged token:
25-
26-
```bash
27-
docker run -d \
28-
-e JENKINS_URL=https://your-jenkins-server.com \
29-
-e JENKINS_PRIVILEGED_SECRET=your-privileged-token \
30-
-e JENKINS_AGENT_NAME=agent-name \
31-
dwolla/jenkins-agent-core:4.13.2-1-jdk11-SNAPSHOT
32-
```
33-
34-
For regular builds, use the standard token:
35-
36-
```bash
37-
docker run -d \
38-
-e JENKINS_URL=https://your-jenkins-server.com \
39-
-e JENKINS_SECRET=your-regular-token \
40-
-e JENKINS_AGENT_NAME=agent-name \
41-
dwolla/jenkins-agent-core:4.13.2-1-jdk11-SNAPSHOT
42-
```
43-
44-
**Note:** The agent uses the token provided at startup for the connection. To support both privileged and non-privileged builds, deploy separate agent instances with the appropriate tokens.

0 commit comments

Comments
 (0)