changed mave proxy ip

This commit is contained in:
nkatanaeva 2021-06-09 15:32:20 +04:00
parent 98ed1d3c01
commit d1652acbd8
4 changed files with 16 additions and 7 deletions

2
build/Jenkinsfile vendored
View file

@ -26,7 +26,7 @@ pipeline {
steps { steps {
script { script {
withCredentials([file(credentialsId: 'ngx', variable: 'ROOT_CERT'),file(credentialsId:'m2', variable: 'SETTINGS')]) { withCredentials([file(credentialsId: 'ngx', variable: 'ROOT_CERT'),file(credentialsId:'m2', variable: 'SETTINGS')]) {
docker.image('maven:3.8.1-jdk-8').inside("-u root --network=jenkins_default") { docker.image('maven:3.8.1-jdk-8').inside("-u root --network=circle_net") {
sh 'cp $ROOT_CERT /usr/local/share/ca-certificates/ && update-ca-certificates && cp $SETTINGS /root/.m2' sh 'cp $ROOT_CERT /usr/local/share/ca-certificates/ && update-ca-certificates && cp $SETTINGS /root/.m2'
sh 'mvn -B clean package' sh 'mvn -B clean package'
} }

View file

@ -353,7 +353,7 @@
<repository> <repository>
<id>maven-central</id> <id>maven-central</id>
<name>maven-central</name> <name>maven-central</name>
<url>https://web</url> <url>https://webnginx</url>
<snapshots> <snapshots>
<enabled>false</enabled> <enabled>false</enabled>
</snapshots> </snapshots>

View file

@ -26,7 +26,7 @@ pipeline {
steps { steps {
script { script {
withCredentials([file(credentialsId: 'ngx', variable: 'ROOT_CERT'),file(credentialsId:'m2', variable: 'SETTINGS')]) { withCredentials([file(credentialsId: 'ngx', variable: 'ROOT_CERT'),file(credentialsId:'m2', variable: 'SETTINGS')]) {
docker.image('maven:3.8.1-jdk-8').inside("-u root --network=jenkins_default") { docker.image('maven:3.8.1-jdk-8').inside("-u root --network=circle_net") {
sh 'cp $ROOT_CERT /usr/local/share/ca-certificates/ && update-ca-certificates && cp $SETTINGS /root/.m2' sh 'cp $ROOT_CERT /usr/local/share/ca-certificates/ && update-ca-certificates && cp $SETTINGS /root/.m2'
sh 'mvn -B clean package' sh 'mvn -B clean package'
} }

15
promotion/Jenkinsfile vendored
View file

@ -16,7 +16,7 @@ pipeline {
steps { steps {
script { script {
withCredentials([file(credentialsId: 'ngx', variable: 'ROOT_CERT'),file(credentialsId:'m2', variable: 'SETTINGS')]) { withCredentials([file(credentialsId: 'ngx', variable: 'ROOT_CERT'),file(credentialsId:'m2', variable: 'SETTINGS')]) {
docker.image('maven:3.8.1-jdk-8').inside("-u root --network=jenkins_default") { docker.image('maven:3.8.1-jdk-8').inside("-u root --network=circle_net") {
sh 'cp $ROOT_CERT /usr/local/share/ca-certificates/ && update-ca-certificates && cp $SETTINGS /root/.m2' sh 'cp $ROOT_CERT /usr/local/share/ca-certificates/ && update-ca-certificates && cp $SETTINGS /root/.m2'
sh 'mvn release:perform' sh 'mvn release:perform'
} }
@ -25,13 +25,22 @@ pipeline {
} }
} }
stage('version') {//change version number stage('version') {//change version number
steps {
script { script {
pom = readMavenPom file: "pom.xml"; pom = readMavenPom file: "pom.xml";
VERSION_NUMBER = VersionNumber(versionNumberString: "${pom.version}") echo: "***version ${pom.version}";
String xStr=${pom.version};
String remv_last = xStr.substring(xStr.indexOf("/") + 1);
int new_version=remv_last.toInteger()+1;
}
script {
VERSION_NUMBER = VersionNumber(versionNumberString: "${new_version}")
currentBuild.displayName = "${VERSION_NUMBER}" currentBuild.displayName = "${VERSION_NUMBER}"
sh "ant -Dversion=${VERSION_NUMBER} build" sh "ant -Dversion=${VERSION_NUMBER} build"
} }
} }
}
stage('publish to nexus') { stage('publish to nexus') {
steps { steps {
script { script {
@ -82,7 +91,7 @@ pipeline {
stage('image build and load') { stage('image build and load') {
steps { steps {
script {} script {}
docker.build registry + ":$BUILD_NUMBER"//change version number docker.build registry + ":${VERSION_NUMBER}"//change version number
} }
script { script {
docker.withRegistry( '', REGISTRY_CREDENTIAL ) { docker.withRegistry( '', REGISTRY_CREDENTIAL ) {