Merge pull request #44 from reportportal/develop

Develop
reportportal · Jun 1, 2023 · 3e92619 · 3e92619
2 parents 968a1be + 41b5e88
commit 3e92619
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 15 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -41,7 +41,7 @@ jobs:
         id: setup
         uses: actions/setup-go@v3
         with:
-          go-version: '^1.19.1'
+          go-version: '1.19.9'
 
       - name: Go Linter
         id: linter

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -35,7 +35,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v3
         with:
-          go-version: '^1.19.1'
+          go-version: '1.19.9'
 
       - name: Go Linter
         uses: golangci/golangci-lint-action@v3
@@ -91,7 +91,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v3
         with:
-          go-version: '^1.19.1'
+          go-version: '1.19.9'
 
       - name: Get Date
         run: 'echo "BUILD_DATE=`date +%FT%T%z`" >> $GITHUB_ENV'

diff --git a/Dockerfile b/Dockerfile
@@ -1,9 +1,9 @@
 FROM alpine:3.16.2
 
 LABEL maintainer="Andrei Varabyeu <andrei_varabyeu@epam.com>"
-LABEL version=5.7.3
+LABEL version=5.8.0
 
-ENV APP_DOWNLOAD_URL https://github.com/reportportal/service-index/releases/download/v5.7.3/service-index_linux_amd64
+ENV APP_DOWNLOAD_URL https://github.com/reportportal/service-index/releases/download/v5.8.0/service-index_linux_amd64
 RUN apk --no-cache add --upgrade apk-tools
 
 ADD ${APP_DOWNLOAD_URL} /service-index

diff --git a/Jenkinsfile.groovy b/Jenkinsfile.groovy
@@ -10,7 +10,6 @@ node {
                 checkout scm
             }
 
-            docker.withServer("$DOCKER_HOST") {
                 stage('Build Docker Image') {
                    sh """          
                    MAJOR_VER=\$(cat VERSION)
@@ -20,29 +19,26 @@ node {
                 }
 
                 stage('Deploy container') {
-                   sh "docker-compose -p reportportal -f $COMPOSE_FILE_RP up -d --force-recreate index"
                    stage('Push to ECR') {
                       withEnv(["AWS_URI=${AWS_URI}", "AWS_REGION=${AWS_REGION}"]) {
-                             sh 'docker tag reportportal-dev/service-index ${AWS_URI}/service-index'
-                             def image = env.AWS_URI + '/service-index'
+                             sh 'docker tag reportportal-dev/service-index ${AWS_URI}/service-index:SNAPSHOT-${BUILD_NUMBER}'
+                             def image = env.AWS_URI + '/service-index' + ':SNAPSHOT-' + env.BUILD_NUMBER
                              def url = 'https://' + env.AWS_URI
                              def credentials = 'ecr:' + env.AWS_REGION + ':aws_credentials'
+                             echo image
                              docker.withRegistry(url, credentials) {
-                                docker.image(image).push('SNAPSHOT-${BUILD_NUMBER}')
+                                docker.image(image).push()
                              }
                       }
                    }              
                 }
 
                 stage('Cleanup') {
-                   docker.withServer("$DOCKER_HOST") {
                        withEnv(["AWS_URI=${AWS_URI}"]) {
                                   sh 'docker rmi ${AWS_URI}/service-index:SNAPSHOT-${BUILD_NUMBER}'
-                                  sh 'docker rmi ${AWS_URI}/service-index:latest'
-                              }
+                                  sh 'docker rmi reportportal-dev/service-index:latest'
                        }
                 }
-            }
 
         }
 }

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-5.7.4-SNAPSHOT
+5.8.1-SNAPSHOT