xai-corp.net/provisioning
1
0
Fork 0
Code Issues 9 Releases Activity

remove unneeded DOCKER_HOST from Jenkinsfile for sslproxy

Browse Source
This commit is contained in:
richard
2020-06-06 22:15:24 -04:00
parent 96ac562c2b
commit c87cae5b30
2 changed files with 1 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.idea/webServers.xml generated
View File

@@ -17,7 +17,7 @@
</fileTransfer> </fileTransfer>
</webServer> </webServer>
<webServer id="5ea0148a-6c7a-4234-aeb2-def267ab69c8" name="web01.xai-corp.net" url="http://192.168.2.18"> <webServer id="5ea0148a-6c7a-4234-aeb2-def267ab69c8" name="web01.xai-corp.net" url="http://192.168.2.18">
<fileTransfer accessType="SFTP" sshConfigId="a4ebeb2f-1c23-4fa8-a856-2d3c9902b799" sshConfig="web01.xai-corp.net" username="ansible"> <fileTransfer accessType="SFTP" host="192.168.2.18" port="22" sshConfigId="a4ebeb2f-1c23-4fa8-a856-2d3c9902b799" sshConfig="web01.xai-corp.net" keyPair="true" username="ansible">
<advancedOptions> <advancedOptions>
<advancedOptions dataProtectionLevel="Private" /> <advancedOptions dataProtectionLevel="Private" />
</advancedOptions> </advancedOptions>

11
dockerfiles/services/sslproxy/Jenkinsfile vendored
View File

@@ -1,10 +1,7 @@
pipeline { pipeline {
environment { environment {
DOCKERFILE = 'Dockerfile'
APP_NAME = 'sslproxy' APP_NAME = 'sslproxy'
APP_PORT = '80'
WORKDIR = 'dockerfiles/services/sslproxy' WORKDIR = 'dockerfiles/services/sslproxy'
DOCKER_HOST = 'dkhost:2376'
} }
agent { label 'docker' } agent { label 'docker' }
@@ -19,8 +16,6 @@ pipeline {
stage('prepare') { stage('prepare') {
steps { steps {
checkout scm checkout scm
// git credentialsId: 'f1f58215-c789-44a2-9b72-50e4425cb061', url: 'ssh://git@git.xai-corp.net:10022/xai-corp.net/provisioning.git'
sh 'ls' sh 'ls'
} }
} }
@@ -29,12 +24,6 @@ pipeline {
steps { steps {
dir(WORKDIR) { dir(WORKDIR) {
withDockerRegistry(credentialsId: 'b11d7f1a-81ac-4daf-8842-56afc0d2370e', url: 'http://dkregistry.xai-corp.net:5000') { withDockerRegistry(credentialsId: 'b11d7f1a-81ac-4daf-8842-56afc0d2370e', url: 'http://dkregistry.xai-corp.net:5000') {
// script {
// docker.withRegistry('http://dkregistry.xai-corp.net:5000', 'b11d7f1a-81ac-4daf-8842-56afc0d2370e') {
// def customImage = docker.build("dkregistry.xai-corp.net:5000/sslproxy:2.1", "-f ${DOCKERFILE} .")
// customImage.push()
// }
// }
sh "pwd" sh "pwd"
sh "xai build" sh "xai build"
} }