From 91f37345ed2a305f29f389ef4e6283638b885fd1 Mon Sep 17 00:00:00 2001 From: Guillem Hernandez Sola Date: Wed, 15 Apr 2026 11:57:56 +0200 Subject: [PATCH] Changes in Debian Docker Agent --- BuildJenkinsfileAgentDebian | 12 ++++++++---- DockerfileAgentDebian | 2 +- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/BuildJenkinsfileAgentDebian b/BuildJenkinsfileAgentDebian index b9f0552..5db738f 100644 --- a/BuildJenkinsfileAgentDebian +++ b/BuildJenkinsfileAgentDebian @@ -11,19 +11,23 @@ pipeline { DOCKER_HUB_USER='guillemhs' IMAGE_NAME="${DOCKER_HUB_USER}/jenkins-debian-13-agent" REGISTRY_CRED_ID='docker-credentials' + + // Executem una comanda shell per obtenir la data actual i la guardem com a variable + DATA = sh(returnStdout: true, script: 'date +%Y.%m.%d').trim() + TAG="${DATA}.${env.BUILD_NUMBER}" } stages { stage('Checkout') { steps { // Get some code from a GIT repository - git branch: 'main', url: 'https://git.agile611.com/Agile611/startusingjenkins.git' + checkout scm } } stage('Docker Build') { steps { script{ echo "Build image ..." - docker.build("${IMAGE_NAME}:${env.BUILD_NUMBER}","-f DockerfileAgentDebian .") + docker.build("${IMAGE_NAME}:${TAG}","-f DockerfileAgentDebian .") } } } @@ -32,10 +36,10 @@ pipeline { steps{ script{ docker.withRegistry('',REGISTRY_CRED_ID){ - def app = docker.image("${IMAGE_NAME}:${env.BUILD_NUMBER}") + def app = docker.image("${IMAGE_NAME}:${TAG}") echo "Pushing image to Docker Hub ..." - app.push("${env.BUILD_NUMBER}") + app.push("${TAG}") app.push("latest") } } diff --git a/DockerfileAgentDebian b/DockerfileAgentDebian index 603a8af..9d5ea84 100644 --- a/DockerfileAgentDebian +++ b/DockerfileAgentDebian @@ -1,4 +1,4 @@ -FROM debian:13.3-slim +FROM debian:13.4-slim ENV DEBIAN_FRONTEND=noninteractive RUN apt-get update && apt-get install -y git openssh-server openjdk-21-jdk RUN useradd -m -d /home/jenkins -s /bin/bash jenkins && echo "jenkins:jenkins" | chpasswd