nomad

commit 60cd4aa5d4f2e9988cd54c193804044a21aceebd
parent 9588e25a82892f1c2bd4692e9b3b5f08715b8b3f
Author: Andreas Gruhler <agruhl@gmx.ch>
Date:   Sun, 10 Aug 2025 10:33:33 +0200

feat(jenkins-agent): use specific agent img tag

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

2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/docker/docker-jenkins-inbound-agent/Dockerfile b/docker/docker-jenkins-inbound-agent/Dockerfile
@@ -19,6 +19,11 @@
 #  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #  THE SOFTWARE.
+
+# Based on:
+# https://github.com/jenkinsci/docker-agent/blob/master/alpine/Dockerfile
+# https://github.com/jenkinsci/docker-inbound-agents/blob/master/docker/Dockerfile
+
 ARG ALPINE_TAG=3.22.1
 
 ## Agent image target
@@ -127,4 +132,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", "$REMOTING_OPTS", "$@"]
+CMD ["/bin/sh", "-c", "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
@@ -105,7 +105,7 @@ jenkins:
                           "/dev/fuse"
                         ],
                         "force_pull": true,
-                        "image": "127.0.0.1:5000/jenkins-inbound-agent:latest"
+                        "image": "127.0.0.1:5000/jenkins-inbound-agent:3327.v868139a_d00e0"
                       },
                       "Env": {
                         "REMOTING_OPTS": "-url http://{{ env "NOMAD_ADDR_jenkins" }} -name %WORKER_NAME% -secret %WORKER_SECRET% -tunnel {{ env "NOMAD_ADDR_jnlp" }}",