forked from tsprasath/knowledge-platform
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'release-2.6.0' into read-api
- Loading branch information
Showing
23 changed files
with
179 additions
and
283 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| .DS_Store | ||
| **/target/** | ||
| **/.idea/** | ||
| *.iml | ||
| **/*.iml |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| FROM openjdk:8-jre-alpine | ||
| RUN apk update \ | ||
| && apk add unzip \ | ||
| && apk add curl \ | ||
| && adduser -u 1001 -h /home/sunbird/ -D sunbird \ | ||
| && mkdir -p /home/sunbird | ||
| RUN chown -R sunbird:sunbird /home/sunbird | ||
| USER sunbird | ||
| COPY ./learning-api/learning-service/target/learning-service-1.0-SNAPSHOT-dist.zip /home/sunbird/ | ||
| RUN unzip /home/sunbird/learning-service-1.0-SNAPSHOT-dist.zip -d /home/sunbird/ | ||
| RUN rm /home/sunbird/learning-service-1.0-SNAPSHOT-dist.zip | ||
| WORKDIR /home/sunbird/ | ||
| CMD java -cp '/home/sunbird/learning-service-1.0-SNAPSHOT/lib/*' play.core.server.ProdServerStart /home/sunbird/learning-service-1.0-SNAPSHOT |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,56 @@ | ||
| node('build-slave') { | ||
| try { | ||
| String ANSI_GREEN = "\u001B[32m" | ||
| String ANSI_NORMAL = "\u001B[0m" | ||
| String ANSI_BOLD = "\u001B[1m" | ||
| String ANSI_RED = "\u001B[31m" | ||
| String ANSI_YELLOW = "\u001B[33m" | ||
|
|
||
| ansiColor('xterm') { | ||
| stage('Checkout') { | ||
| if (!env.hub_org) { | ||
| println(ANSI_BOLD + ANSI_RED + "Uh Oh! Please set a Jenkins environment variable named hub_org with value as registery/sunbidrded" + ANSI_NORMAL) | ||
| error 'Please resolve the errors and rerun..' | ||
| } else | ||
| println(ANSI_BOLD + ANSI_GREEN + "Found environment variable named hub_org with value as: " + hub_org + ANSI_NORMAL) | ||
| } | ||
| cleanWs() | ||
| if (params.github_release_tag == "") { | ||
| checkout scm | ||
| commit_hash = sh(script: 'git rev-parse --short HEAD', returnStdout: true).trim() | ||
| branch_name = sh(script: 'git name-rev --name-only HEAD | rev | cut -d "/" -f1| rev', returnStdout: true).trim() | ||
| build_tag = branch_name + "_" + commit_hash | ||
| println(ANSI_BOLD + ANSI_YELLOW + "github_release_tag not specified, using the latest commit hash: " + commit_hash + ANSI_NORMAL) | ||
| } else { | ||
| def scmVars = checkout scm | ||
| checkout scm: [$class: 'GitSCM', branches: [[name: "refs/tags/$params.github_release_tag"]], userRemoteConfigs: [[url: scmVars.GIT_URL]]] | ||
| build_tag = params.github_release_tag | ||
| println(ANSI_BOLD + ANSI_YELLOW + "github_release_tag specified, building from tag: " + params.github_release_tag + ANSI_NORMAL) | ||
| } | ||
| echo "build_tag: " + build_tag | ||
|
|
||
| stage('Build') { | ||
| env.NODE_ENV = "build" | ||
| print "Environment will be : ${env.NODE_ENV}" | ||
| sh 'mvn clean install -DskipTests=true ' | ||
|
|
||
| } | ||
|
|
||
| stage('Package') { | ||
| dir('learning-api') { | ||
| sh 'mvn play2:dist -pl learning-service' | ||
| } | ||
| sh('chmod 777 ./build.sh') | ||
| sh("./build.sh ${build_tag} ${env.NODE_NAME} ${hub_org}") | ||
| } | ||
| stage('ArchiveArtifacts') { | ||
| archiveArtifacts "metadata.json" | ||
| currentBuild.description = "${build_tag}" | ||
| } | ||
| } | ||
| } | ||
| catch (err) { | ||
| currentBuild.result = "FAILURE" | ||
| throw err | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| #!/bin/bash | ||
| # Build script | ||
| set -eo pipefail | ||
|
|
||
| build_tag=$1 | ||
| name=learning-service | ||
| node=$2 | ||
| org=$3 | ||
|
|
||
| docker build -f ./Dockerfile --label commitHash=$(git rev-parse --short HEAD) -t ${org}/${name}:${build_tag} . | ||
| echo {\"image_name\" : \"${name}\", \"image_tag\" : \"${build_tag}\", \"node_name\" : \"$node\"} > metadata.json |
This file was deleted.
Oops, something went wrong.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| <configuration> | ||
|
|
||
| <conversionRule conversionWord="coloredLevel" converterClass="play.api.libs.logback.ColoredLevel" /> | ||
|
|
||
| <!-- transaction-event-trigger START --> | ||
| <timestamp key="timestamp" datePattern="yyyy-MM-dd"/> | ||
| <!-- common transactions logs --> | ||
| <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender"> | ||
| <encoder> | ||
| <pattern>%d %msg%n</pattern> | ||
| </encoder> | ||
| </appender> | ||
|
|
||
| <appender name="ASYNCSTDOUT" class="ch.qos.logback.classic.AsyncAppender"> | ||
| <appender-ref ref="STDOUT" /> | ||
| </appender> | ||
|
|
||
|
|
||
| <logger name="play" level="INFO" /> | ||
| <logger name="DefaultPlatformLogger" level="INFO" /> | ||
| <!-- Telemetry Loggers--> | ||
| <logger name="TelemetryEventLogger" level="INFO" /> | ||
|
|
||
| <root level="INFO"> | ||
| <appender-ref ref="ASYNCSTDOUT" /> | ||
| </root> | ||
|
|
||
| </configuration> |
File renamed without changes.
File renamed without changes.
File renamed without changes.
4 changes: 2 additions & 2 deletions
4
learning-api/learning-manager/pom.xml → learning-api/learning-service/pom.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.