#Issue KN-933 fix: Updated the docker image name

aimansharief · Sep 19, 2023 · 612e42d · 612e42d
1 parent b29e55b
commit 612e42d
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git a/.github/workflows/search-api-build.yml b/.github/workflows/search-api-build.yml
@@ -43,8 +43,8 @@ jobs:
           cd search-api/
           sh knowlg-docker-image.sh ${{ github.ref_name }}
           docker images
-          docker tag search-service:${{ github.ref_name }} ${{ vars.DOCKERHUB_USERNAME }}/search-service:${{ github.ref_name }}
-          docker push ${{ vars.DOCKERHUB_USERNAME }}/search-service:${{ github.ref_name }}
+          docker tag knowlg-search:${{ github.ref_name }} ${{ vars.DOCKERHUB_USERNAME }}/knowlg-search:${{ github.ref_name }}
+          docker push ${{ vars.DOCKERHUB_USERNAME }}/knowlg-search:${{ github.ref_name }}
 
       - name: Store Maven dependencies cache
         uses: actions/cache@v2

diff --git a/.github/workflows/search-job-build.yml b/.github/workflows/search-job-build.yml
@@ -27,9 +27,9 @@ jobs:
         run: |
           cd search-job/
           mvn clean install -DskipTests
-          docker build -t ${{ vars.DOCKERHUB_USERNAME }}/search-indexer:${{ github.ref_name }} .
+          docker build -t ${{ vars.DOCKERHUB_USERNAME }}/knowlg-search-job:${{ github.ref_name }} .
           docker images
-          docker push ${{ vars.DOCKERHUB_USERNAME }}/search-indexer:${{ github.ref_name }}
+          docker push ${{ vars.DOCKERHUB_USERNAME }}/knowlg-search-job:${{ github.ref_name }}
 
   unit-tests:
     runs-on: ubuntu-latest

diff --git a/search-api/build/search-service/Dockerfile → search-api/build/knowlg-search/Dockerfile b/search-api/build/search-service/Dockerfile → search-api/build/knowlg-search/Dockerfile
@@ -11,4 +11,4 @@ RUN unzip /home/sunbird/search-service-1.0-SNAPSHOT.zip -d /home/sunbird/
 RUN rm /home/sunbird/search-service-1.0-SNAPSHOT.zip
 COPY --chown=sunbird ./schemas /home/sunbird/search-service-1.0-SNAPSHOT/schemas
 WORKDIR /home/sunbird/
-CMD java -XX:+PrintFlagsFinal $JAVA_OPTIONS  -cp '/home/sunbird/search-service-1.0-SNAPSHOT/lib/*' -Dconfig.file=/home/sunbird/search-service-1.0-SNAPSHOT/config/application.conf -Dlogger.file=/home/sunbird/search-service-1.0-SNAPSHOT/config/logback.xml play.core.server.ProdServerStart /home/sunbird/search-service-1.0-SNAPSHOT
+CMD java -XX:+PrintFlagsFinal $JAVA_OPTIONS  -cp '/home/sunbird/search-service-1.0-SNAPSHOT/lib/*' -Dconfig.file=/home/sunbird/search-service-1.0-SNAPSHOT/conf/application.conf -Dlogger.file=/home/sunbird/search-service-1.0-SNAPSHOT/conf/logback.xml play.core.server.ProdServerStart /home/sunbird/search-service-1.0-SNAPSHOT/bin
diff --git a/search-api/build/search-service/Jenkinsfile → search-api/build/knowlg-search/Jenkinsfile b/search-api/build/search-service/Jenkinsfile → search-api/build/knowlg-search/Jenkinsfile
diff --git a/...pi/build/search-service/auto_build_deploy → ...api/build/knowlg-search/auto_build_deploy b/...pi/build/search-service/auto_build_deploy → ...api/build/knowlg-search/auto_build_deploy
diff --git a/search-api/knowlg-docker-image.sh b/search-api/knowlg-docker-image.sh
@@ -1,9 +1,9 @@
 #!/bin/bash
 TAG=$1
 
-docker rmi $(docker images -a | grep search-service | awk '{print $1":"$2}')
+docker rmi $(docker images -a | grep knowlg-search | awk '{print $1":"$2}')
 
 cd knowlg-search
 sbt dist
 cd ../
-docker build -f build/search-service/Dockerfile -t search-service:${TAG} .
+docker build -f build/knowlg-search/Dockerfile -t knowlg-search:${TAG} .