From 72f4fa8abbe56bff8e283fc7c8fbf85734b4cbb8 Mon Sep 17 00:00:00 2001 From: TheBrokenRail Date: Mon, 21 Dec 2020 14:32:06 -0500 Subject: [PATCH] Fix Jenkins --- Dockerfile.build | 3 --- Jenkinsfile | 7 +++---- 2 files changed, 3 insertions(+), 7 deletions(-) delete mode 100644 Dockerfile.build diff --git a/Dockerfile.build b/Dockerfile.build deleted file mode 100644 index b5070d0..0000000 --- a/Dockerfile.build +++ /dev/null @@ -1,3 +0,0 @@ -FROM ubuntu:focal - -RUN apt-get update && apt-get install -y docker.io diff --git a/Jenkinsfile b/Jenkinsfile index b91ee28..dc058a2 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,18 +1,17 @@ pipeline { agent { dockerfile { - filename 'Dockerfile.build' - args '-v /var/run/docker.sock:/var/run/docker.sock' + filename 'Dockerfile' } } stages { stage('Build') { steps { - sh 'DOCKER_BUILD_OPTIONS="--no-cache" ./run.sh' + sh './build-minetest.sh' } post { success { - archiveArtifacts artifacts: 'out/*.deb', fingerprint: true + archiveArtifacts artifacts: '/out/*.deb', fingerprint: true } } }