From c12521d7c54e0203fe9781deec30b0cea611716f Mon Sep 17 00:00:00 2001 From: Kumar Gauraw Date: Mon, 20 May 2024 14:37:39 +0530 Subject: [PATCH 1/3] Issue #KN-1089 fix: fix for jenkins build --- build/taxonomy-service/Dockerfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/build/taxonomy-service/Dockerfile b/build/taxonomy-service/Dockerfile index fc524d871..1a5e206c1 100644 --- a/build/taxonomy-service/Dockerfile +++ b/build/taxonomy-service/Dockerfile @@ -1,7 +1,6 @@ FROM --platform=linux/x86_64 eclipse-temurin:11.0.20.1_1-jdk-focal RUN apt-get update \ - && apt-get install unzip \ - && apt-get install curl \ + && apt-get install -y unzip curl \ && adduser --uid 1001 --home /home/sunbird/ --disabled-login sunbird \ && mkdir -p /home/sunbird \ && chown -R sunbird:sunbird /home/sunbird From cd807d1c96740e183be33439c28a72e194249628 Mon Sep 17 00:00:00 2001 From: Kumar Gauraw Date: Mon, 20 May 2024 15:04:48 +0530 Subject: [PATCH 2/3] Issue #KN-1089 fix: updated search service build script --- build/search-service/Jenkinsfile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/build/search-service/Jenkinsfile b/build/search-service/Jenkinsfile index a565e7da3..8e1e36b3e 100644 --- a/build/search-service/Jenkinsfile +++ b/build/search-service/Jenkinsfile @@ -21,11 +21,14 @@ node('build-slave') { commit_hash = sh(script: 'git rev-parse --short HEAD', returnStdout: true).trim() build_tag = sh(script: "echo " + params.github_release_tag.split('/')[-1] + "_" + commit_hash + "_" + env.BUILD_NUMBER, returnStdout: true).trim() echo "build_tag: " + build_tag + cloud_store_group_id = params.CLOUD_STORE_GROUP_ID + cloud_store_artifact_id = params.CLOUD_STORE_ARTIFACT_ID + cloud_store_version = params.CLOUD_STORE_VERSION stage('Build') { env.NODE_ENV = "build" print "Environment will be : ${env.NODE_ENV}" - sh 'mvn clean install -DskipTests=true ' + sh 'mvn clean install -DskipTests=true -DCLOUD_STORE_GROUP_ID=' + cloud_store_group_id + ' -DCLOUD_STORE_ARTIFACT_ID=' + cloud_store_artifact_id + ' -DCLOUD_STORE_VERSION=' + cloud_store_version } From e9c0840a1cafa03ac08d191b4bf035df5ae9116c Mon Sep 17 00:00:00 2001 From: Kumar Gauraw Date: Mon, 20 May 2024 15:15:50 +0530 Subject: [PATCH 3/3] Issue #KN-1089 fix: updated docker file --- build/search-service/Dockerfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/build/search-service/Dockerfile b/build/search-service/Dockerfile index 97084c3a8..5375633a1 100644 --- a/build/search-service/Dockerfile +++ b/build/search-service/Dockerfile @@ -1,7 +1,6 @@ FROM --platform=linux/x86_64 eclipse-temurin:11.0.20.1_1-jdk-focal RUN apt-get update \ - && apt-get install unzip \ - && apt-get install curl \ + && apt-get install -y unzip curl \ && adduser --uid 1001 --home /home/sunbird/ --disabled-login sunbird \ && mkdir -p /home/sunbird \ && chown -R sunbird:sunbird /home/sunbird