From da8cbc96b5cab90044378da164d5669ac6452e11 Mon Sep 17 00:00:00 2001 From: Lucas Date: Tue, 27 Jan 2026 15:46:41 +0100 Subject: [PATCH] fix(jenkins): new docker host rootless --- Jenkinsfile | 71 +++++++++++++++++++++++++---------------------------- 1 file changed, 34 insertions(+), 37 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 0fcbb6b..250f5e6 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,8 +1,9 @@ pipeline { agent any environment { - DOCKER_HOST = "unix:///var/run/docker.sock" + DOCKER_HOST = "unix:///run/user/1001/docker.sock" APP_VERSION = "${env.BRANCH_NAME}-${env.BUILD_NUMBER}" + DOCKER_CONFIG = "${env.WORKSPACE}/.docker" } stages { stage('Build') { @@ -16,35 +17,35 @@ pipeline { sh "docker compose build" } } - stage('Lighthouse Audit') { - steps { + // stage('Lighthouse Audit') { + // steps { - // Create volumes but no run with safety - sh "docker rm -f audit-tmp lighthouse-audit || true" - sh "docker compose --profile audit create --no-build --remove-orphans lighthouse-audit" + // // Create volumes but no run with safety + // sh "docker rm -f audit-tmp lighthouse-audit || true" + // sh "docker compose --profile audit create --no-build --remove-orphans lighthouse-audit" - // Extract astro data from temp container to tmp-dist folder - sh "docker create --name audit-tmp portfolio:${env.APP_VERSION}" - sh "mkdir -p ./tmp-dist" - sh "docker cp audit-tmp:/usr/share/caddy/. ./tmp-dist" - sh "docker rm -f audit-tmp" + // // Extract astro data from temp container to tmp-dist folder + // sh "docker create --name audit-tmp portfolio:${env.APP_VERSION}" + // sh "mkdir -p ./tmp-dist" + // sh "docker cp audit-tmp:/usr/share/caddy/. ./tmp-dist" + // sh "docker rm -f audit-tmp" - // Inject data from tmp-dist and config to audit container - sh "docker cp ./tmp-dist/. lighthouse-audit:/app/dist/" - sh "docker cp .lighthouserc.cjs lighthouse-audit:/app/dist/audit-config.cjs" - sh "rm -rf ./tmp-dist" + // // Inject data from tmp-dist and config to audit container + // sh "docker cp ./tmp-dist/. lighthouse-audit:/app/dist/" + // sh "docker cp .lighthouserc.cjs lighthouse-audit:/app/dist/audit-config.cjs" + // sh "rm -rf ./tmp-dist" - // Now run - sh "docker start -a lighthouse-audit" + // // Now run + // sh "docker start -a lighthouse-audit" - // Get reports - sh "mkdir -p ./.lighthouseci" - sh "docker cp lighthouse-audit:/app/.lighthouseci/. ./.lighthouseci/" + // // Get reports + // sh "mkdir -p ./.lighthouseci" + // sh "docker cp lighthouse-audit:/app/.lighthouseci/. ./.lighthouseci/" - // Clean - sh "docker rm -f lighthouse-audit" - } - } + // // Clean + // sh "docker rm -f lighthouse-audit" + // } + // } stage('Deploy') { // Deploy only master branch when { @@ -56,24 +57,20 @@ pipeline { // Update caddy-reverse-proxy cache sh "docker exec caddy-reverse-proxy caddy reload --config /etc/caddy/Caddyfile" - - // Keep updated docker-compose.yml and Caddyfile for safety - sh "cp docker-compose.yml /backup-portfolio/docker-compose.yml" - sh "docker cp portfolio:/etc/caddy/Caddyfile /backup-portfolio/Caddyfile" } } } post { always { - echo "Publish Lighthouse audit..." - publishHTML([ - allowMissing: true, - alwaysLinkToLastBuild: true, - keepAll: false, - reportDir: '.lighthouseci', - reportFiles: '*.html', - reportName: 'Lighthouse Report' - ]) + // echo "Publish Lighthouse audit..." + // publishHTML([ + // allowMissing: true, + // alwaysLinkToLastBuild: true, + // keepAll: false, + // reportDir: '.lighthouseci', + // reportFiles: '*.html', + // reportName: 'Lighthouse Report' + // ]) echo "Clean unused image" sh "docker image prune -f" }