diff --git a/dockerfiles/tasks/Jenkinsfile b/dockerfiles/tasks/Jenkinsfile index 8040e90..1c85d51 100644 --- a/dockerfiles/tasks/Jenkinsfile +++ b/dockerfiles/tasks/Jenkinsfile @@ -6,12 +6,6 @@ pipeline { choices: ['ansible', 'apidocjs', 'composer', 'mondrian', 'php'], description: 'What image would you like to build?' ) - string( - name: 'VERSION', - default: 'latest', - description: 'what tag to apply to the image' - - ) } options { buildDiscarder(logRotator(numToKeepStr: '10')) @@ -23,23 +17,16 @@ pipeline { checkout scm sh 'ls' -// dir("dockerfiles/tasks/$params.IMAGE") { -// sh 'chmod +x build.sh && ls -l' -// -// sh './build.sh' -// } + withDockerRegistry(credentialsId: 'b11d7f1a-81ac-4daf-8842-56afc0d2370e', url: 'http://dkregistry.xai-corp.net:5000') { - def workdir = "dockerfiles/tasks/$params.IMAGE" - def dockerfile = 'Dockerfile' + dir("dockerfiles/tasks/$params.IMAGE") { + sh 'chmod +x build.sh && ls -l' - dir(workdir) { - docker.withRegistry('http://dkregistry.xai-corp.net:5000') { - def customImage = docker.build("dkregistry.xai-corp.net:5000/xaicorp/${params.IMAGE}:${params.VERSION}", "-f ${dockerfile} .") - customImage.inside() { - } - customImage.push() + sh './build.sh' } + } + } } } diff --git a/dockerfiles/tasks/php/Jenkinsfile b/dockerfiles/tasks/php/Jenkinsfile index 2f7a158..6728bcd 100644 --- a/dockerfiles/tasks/php/Jenkinsfile +++ b/dockerfiles/tasks/php/Jenkinsfile @@ -20,7 +20,7 @@ pipeline { def version = "7.0" def dockerfile = "Dockerfile-70" dir(workdir) { - docker.withRegistry('http://dkregistry.xai-corp.net:5000') { + docker.withRegistry('http://dkregistry.xai-corp.net:5000', 'b11d7f1a-81ac-4daf-8842-56afc0d2370e') { def customImage = docker.build("dkregistry.xai-corp.net:5000/xaicorp/php:${version}", "-f ${dockerfile} .") customImage.inside() { sh "php --version | grep 'PHP 7.0'" @@ -37,7 +37,7 @@ pipeline { def version = "7.1" def dockerfile = "Dockerfile-71" dir(workdir) { - docker.withRegistry('http://dkregistry.xai-corp.net:5000') { + docker.withRegistry('http://dkregistry.xai-corp.net:5000', 'b11d7f1a-81ac-4daf-8842-56afc0d2370e') { def customImage = docker.build("dkregistry.xai-corp.net:5000/xaicorp/php:${version}", "-f ${dockerfile} .") customImage.inside() { sh "php --version | grep 'PHP 7.1'"