nomad

commit 222020a21d907e39f0dd7b876af71c2d29502378
parent a6287ae96eeaab8b97efd691192146c85d7d8996
Author: Andreas Gruhler <agruhl@gmx.ch>
Date:   Sun,  3 Aug 2025 20:20:36 +0200

feat(jenkins-agent): use REMOTING_OPTS

The other environment variables seem deprecated:
https://github.com/jenkinsci/docker-agent/blob/master/jenkins-agent#L32

Diffstat:
M
docker/docker-jenkins-inbound-agent/Dockerfile
 | 
2
+-
M
hcl/default/jenkins/templates/jenkins.yaml.tmpl
 | 
5
+----

2 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/docker/docker-jenkins-inbound-agent/Dockerfile b/docker/docker-jenkins-inbound-agent/Dockerfile
@@ -136,4 +136,4 @@ LABEL \
     org.opencontainers.image.source="https://github.com/jenkinsci/docker-agent" \
     org.opencontainers.image.licenses="MIT"
 
-CMD ["java", "-jar", "/usr/share/jenkins/agent.jar"]
+CMD ["java", "-jar", "/usr/share/jenkins/agent.jar", "$REMOTING_OPTS", "$@"]
diff --git a/hcl/default/jenkins/templates/jenkins.yaml.tmpl b/hcl/default/jenkins/templates/jenkins.yaml.tmpl
@@ -108,10 +108,7 @@ jenkins:
                         "image": "127.0.0.1:5000/jenkins-inbound-agent:latest"
                       },
                       "Env": {
-                        "JENKINS_URL": "http://{{ env "NOMAD_ADDR_jenkins" }}",
-                        "JENKINS_AGENT_NAME": "%WORKER_NAME%",
-                        "JENKINS_SECRET": "%WORKER_SECRET%",
-                        "JENKINS_TUNNEL": "{{ env "NOMAD_ADDR_jnlp" }}",
+                        "REMOTING_OPTS": "-url http://{{ env "NOMAD_ADDR_jenkins" }} -name %WORKER_NAME% -secret %WORKER_SECRET% -tunnel {{ env "NOMAD_ADDR_jnlp" }}"
                         "DOCKER_HOST": "unix:///home/jenkins/agent/podman.sock",
                         "DOCKER_OPTS": "--insecure-registry=\"haproxy.lan:5000\""
                       },