From df5caadd570e554b4e8d0095836b54e5fe5da834 Mon Sep 17 00:00:00 2001 From: takiguchi Date: Tue, 21 May 2019 22:13:54 +0200 Subject: [PATCH] Add Jenkinsfile and remove the backend address. --- Jenkinsfile | 89 +++++++++++++++++++ src/main/ts/src/app/app.component.ts | 2 +- src/main/ts/src/app/login/login.service.ts | 6 +- src/main/ts/src/app/server/server.service.ts | 3 +- .../ts/src/environments/environment.integ.ts | 1 - .../ts/src/environments/environment.prod.ts | 1 - src/main/ts/src/environments/environment.ts | 1 - 7 files changed, 92 insertions(+), 11 deletions(-) create mode 100644 Jenkinsfile diff --git a/Jenkinsfile b/Jenkinsfile new file mode 100644 index 0000000..e6f928b --- /dev/null +++ b/Jenkinsfile @@ -0,0 +1,89 @@ +pipeline { + agent any + + tools { + maven 'Maven-3.5.0' + jdk 'OpenJdk-1.8.0_181' + } + + environment { + JAVA_HOME = '/usr/lib/jvm/java-8-openjdk-amd64' + } + + stages { + stage('Configuration') { + steps { + script { + env.MINAGER_VERSION = sh(script: "grep '' pom.xml | head -n 1 | cut -d '>' -f 2 | cut -d '<' -f 1", + returnStdout: true).toString().trim(); + } + } + } + + stage('Angular build') { + steps { + dir('src/main/ts') { + sh ''' + npm install + ng build --configuration=production + ''' + } + } + } + + stage('SpringBoot build') { + steps { + sh 'mvn clean package -DskipTests=true' + } + } + + stage('Publish') { + steps { + sh 'mv target/minager*.jar target/minager.jar' + sshPublisher( + publishers: [ + sshPublisherDesc( + configName: 'DebianServer [clubs]', + transfers: [ + sshTransfer( + cleanRemote: false, + excludes: '', + execCommand: '', + execTimeout: 120000, + flatten: false, + makeEmptyDirs: false, + noDefaultExcludes: false, + patternSeparator: '[, ]+', + remoteDirectory: '', + remoteDirectorySDF: false, + removePrefix: 'target/', + sourceFiles: "**/minager-${env.MINAGER_VERSION}.jar" + ), + sshTransfer( + cleanRemote: false, + excludes: '', + execCommand: """ + sudo /home/minecraft/minager/bin/minager-jenkins.sh + sudo service minager restart + """, + execTimeout: 120000, + flatten: false, + makeEmptyDirs: false, + noDefaultExcludes: false, + patternSeparator: '[, ]+', + remoteDirectory: '', + remoteDirectorySDF: false, + removePrefix: '', + sourceFiles: '' + ) + ], + usePromotionTimestamp: false, + useWorkspaceInPromotion: false, + verbose: false + ) + ] + ) + } + } + } +} \ No newline at end of file diff --git a/src/main/ts/src/app/app.component.ts b/src/main/ts/src/app/app.component.ts index 33ee837..bccd1eb 100644 --- a/src/main/ts/src/app/app.component.ts +++ b/src/main/ts/src/app/app.component.ts @@ -19,7 +19,7 @@ export class AppComponent implements OnInit { ) {} ngOnInit(): void { - this.http.get(`${environment.apiUrl}/api/version`).subscribe(pApiVersion => { + this.http.get(`/api/version`).subscribe(pApiVersion => { this.apiVersion = pApiVersion; this.connectedToApi = true; this.loading = false; diff --git a/src/main/ts/src/app/login/login.service.ts b/src/main/ts/src/app/login/login.service.ts index 15384f0..071d70b 100644 --- a/src/main/ts/src/app/login/login.service.ts +++ b/src/main/ts/src/app/login/login.service.ts @@ -3,12 +3,8 @@ import { HttpClient } from '@angular/common/http'; import { Observable } from 'rxjs'; -import { environment } from '../../environments/environment'; - import { User } from '../core/entities'; -const LOGIN_URL = environment.apiUrl + '/api/account/login'; - @Injectable() export class LoginService { @@ -17,6 +13,6 @@ export class LoginService { ) {} login(user: User): Observable { - return this.http.post(LOGIN_URL, user); + return this.http.post('/api/account/login', user); } } diff --git a/src/main/ts/src/app/server/server.service.ts b/src/main/ts/src/app/server/server.service.ts index f2c448a..eed0811 100644 --- a/src/main/ts/src/app/server/server.service.ts +++ b/src/main/ts/src/app/server/server.service.ts @@ -1,9 +1,8 @@ import { HttpClient } from '@angular/common/http'; import { Injectable } from '@angular/core'; import { Observable } from 'rxjs'; -import { environment } from '../../environments/environment'; -const SERVER_URL = environment.apiUrl + '/api/server'; +const SERVER_URL = '/api/server'; @Injectable() export class ServerService { diff --git a/src/main/ts/src/environments/environment.integ.ts b/src/main/ts/src/environments/environment.integ.ts index e584a52..8407041 100644 --- a/src/main/ts/src/environments/environment.integ.ts +++ b/src/main/ts/src/environments/environment.integ.ts @@ -4,7 +4,6 @@ export const environment = { production: false, - apiUrl: 'http://176.188.217.1:54447', appVersion: '1.0.1', title: 'INTÉGRATION' }; diff --git a/src/main/ts/src/environments/environment.prod.ts b/src/main/ts/src/environments/environment.prod.ts index fd03754..1b82260 100644 --- a/src/main/ts/src/environments/environment.prod.ts +++ b/src/main/ts/src/environments/environment.prod.ts @@ -1,6 +1,5 @@ export const environment = { production: true, - apiUrl: 'https://176.188.217.1:54446', appVersion: '1.0.1', title: '' }; diff --git a/src/main/ts/src/environments/environment.ts b/src/main/ts/src/environments/environment.ts index fe3ba14..41d63dd 100644 --- a/src/main/ts/src/environments/environment.ts +++ b/src/main/ts/src/environments/environment.ts @@ -4,7 +4,6 @@ export const environment = { production: false, - apiUrl: 'http://localhost:8080', appVersion: '1.0.1', title: 'LOCAL' };