Release v4.0

.github/workflows/build-gradle-project.yml

@@ -0,0 +1,49 @@
+name: Build state-manager-service docker image
+
+on: 
+  push:
+
+jobs:
+  build-gradle-project:
+    env:
+      IMAGE_TAG: 2.2
+    runs-on: ubuntu-latest
+    steps:
+      - name: Get branch names
+        id: branch-names
+        uses: tj-actions/branch-names@v8
+
+      - name: Get current branch name
+        if: steps.branch-names.outputs.is_default == 'false'
+        run: |
+          echo "Running on branch: ${{ steps.branch-names.outputs.current_branch }}"
+      - name: Checkout project sources
+        uses: actions/checkout@v3
+      - uses: actions/setup-java@v3
+        with:
+          java-version: '8'
+          distribution: 'temurin'
+      - name: Setup Gradle
+        uses: gradle/gradle-build-action@v2
+        with:
+          gradle-version: 7.4
+
+      - name: Login to Docker Hub
+        uses: docker/login-action@f4ef78c080cd8ba55a85445d5b36e214a81df20a
+        with:
+          username: ${{ secrets.ENV_DOCKER_USER }}
+          password: ${{ secrets.ENV_DOCKER_PASS }}
+
+      - name: Run build with Gradle Wrapper
+        run: |
+         ./gradlew build docker
+
+      - name: Push to Docker Hub if branch is develop
+        if: steps.branch-names.outputs.current_branch == 'develop'
+        run: | 
+         docker push "kingstonduo/state-manager-service:$IMAGE_TAG"
+
+      - name: Push to Docker Hub if branch is not develop
+        if: steps.branch-names.outputs.current_branch != 'develop'
+        run: |
+          docker push "kingstonduo/state-manager-service:${{ steps.branch-names.outputs.current_branch }}"

Dockerfile

@@ -10,6 +10,5 @@ ARG DEPENDENCY=target/dependency
 COPY ${DEPENDENCY}/BOOT-INF/lib /app/lib
 COPY ${DEPENDENCY}/META-INF /app/META-INF
 COPY ${DEPENDENCY}/BOOT-INF/classes /app
-RUN echo '*	*	*	*	*	java -cp /app:/app/lib/* org.kpmp.FailedPackageChecker' >> /etc/crontabs/root
 
 CMD crond && java -cp /app:app/lib/* org.kpmp.Application

build.gradle

@@ -24,7 +24,7 @@ apply plugin: 'com.palantir.docker'
 
 jar {
     baseName='state-manager-service'
-    version= '2.0'
+    version= '2.2'
 }
 
 repositories {
@@ -55,8 +55,31 @@ task unpack(type: Copy) {
     into("build/dependency")
 }
 
+def getCurrentGitBranch() {
+  if (project.hasProperty('tag')) {
+    def tagValue = project.property('tag')
+    return tagValue
+  } else {
+      def gitBranch = "Unknown branch"
+      try {
+        def workingDir = new File("${project.projectDir}")
+        def result = 'git rev-parse --abbrev-ref HEAD'.execute(null, workingDir)
+        result.waitFor()
+        if (result.exitValue() == 0) {
+            gitBranch = result.text.trim()
+        }
+      } catch (e) {
+        }
+        if (gitBranch == "develop" || gitBranch == "master"){
+          return jar.version
+        }else{
+          return gitBranch
+        }
+    }
+}
+
 docker {
-    name "${project.group}/${jar.baseName}"
+    name "kingstonduo/${jar.baseName}:" + getCurrentGitBranch()
     copySpec.from(tasks.unpack.outputs).into("dependency")
     buildArgs(['DEPENDENCY': "dependency"])
 }