merge: mifos-v2.0.0 into dev

.circleci/config.yml

@@ -0,0 +1,186 @@
+version: 2.1
+orbs:
+  docker-buildx: devarsh/docker-buildx-orb@0.1.1
+executors:
+  docker-executor:
+    docker:
+      - image: eclipse-temurin:17-jdk
+jobs:
+  build_and_push_tag_image:
+    executor: docker-executor
+    environment:
+      JVM_OPTS: -Xmx512m
+      TERM: dumb
+    steps:
+      - checkout
+      - setup_remote_docker:
+          version: 20.10.24
+      - run:
+          name: Set Lowercase Docker Image Vars
+          # Using tr for POSIX compatibility, could use ${VAR,,} with Bash 4+
+          command: |
+            echo "export DOCKER_ORG_LOWER=$(echo $CIRCLE_PROJECT_USERNAME | tr '[:upper:]' '[:lower:]')" >> $BASH_ENV
+            echo "export DOCKER_REPO_LOWER=$(echo $CIRCLE_PROJECT_REPONAME | tr '[:upper:]' '[:lower:]')" >> $BASH_ENV
+            echo "Using Docker Namespace: $DOCKER_ORG_LOWER"
+            echo "Using Docker Repository: $DOCKER_REPO_LOWER"
+      - run:
+          name: Install Docker CLI
+          command: |
+            apt-get update
+            apt-get install -y curl ca-certificates gnupg
+            install -m 0755 -d /etc/apt/keyrings
+            curl -fsSL https://download.docker.com/linux/debian/gpg -o /etc/apt/keyrings/docker.asc
+            chmod a+r /etc/apt/keyrings/docker.asc
+            echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.asc] https://download.docker.com/linux/debian bullseye stable" | tee /etc/apt/sources.list.d/docker.list > /dev/null
+            apt-get update
+            apt-cache madison docker-ce-cli | grep 20.10
+            apt-get install -y docker-ce-cli=5:20.10.24~3-0~debian-bullseye
+      - docker-buildx/install
+      # - run:
+      #     name: Check if Docker image tag exists
+      #     command: |
+      #       IMAGE_TAG=$CIRCLE_TAG
+      #       # Using lowercase variables defined above
+      #       IMAGE_NAME="$DOCKER_ORG_LOWER/$DOCKER_REPO_LOWER"
+      #       echo "Checking for Docker image: $IMAGE_NAME:$IMAGE_TAG"
+      #       # Ensure DOCKERHUB_USERNAME and DOCKERHUB_PASSWORD are set in your CircleCI Context or Project Environment Variables
+      #       if curl -s -f -u "$DOCKERHUB_USERNAME":"$DOCKERHUB_PASSWORD" "https://hub.docker.com/v2/repositories/$IMAGE_NAME/tags/$IMAGE_TAG" > /dev/null; then
+      #         echo "Skipping the build and push as the tag $IMAGE_TAG already exists in Docker Hub for image $IMAGE_NAME."
+      #         circleci-agent step halt
+      #       else
+      #         echo "Tag $IMAGE_TAG does not exist for image $IMAGE_NAME. Proceeding with build."
+      #       fi
+      - run:
+          name: Build Application
+          command: ./gradlew bootJar
+      - docker-buildx/build-and-push:
+          # Using lowercase variables defined above
+          image-name: "$DOCKER_ORG_LOWER/$DOCKER_REPO_LOWER"
+          tag: "$CIRCLE_TAG"
+          # Add dockerhub credentials if needed
+          # dockerhub-username: "$DOCKERHUB_USERNAME"
+          # dockerhub-password: "$DOCKERHUB_PASSWORD"
+  build_and_push_branch_image:
+    executor: docker-executor
+    environment:
+      JVM_OPTS: -Xmx512m
+      TERM: dumb
+    steps:
+      - checkout
+      - setup_remote_docker:
+          version: 20.10.24
+      - run:
+          name: Set Lowercase Docker Image Vars
+          command: |
+            echo "export DOCKER_ORG_LOWER=$(echo $CIRCLE_PROJECT_USERNAME | tr '[:upper:]' '[:lower:]')" >> $BASH_ENV
+            echo "export DOCKER_REPO_LOWER=$(echo $CIRCLE_PROJECT_REPONAME | tr '[:upper:]' '[:lower:]')" >> $BASH_ENV
+            echo "Using Docker Namespace: $DOCKER_ORG_LOWER"
+            echo "Using Docker Repository: $DOCKER_REPO_LOWER"
+      - run:
+          name: Install Docker CLI
+          command: |
+            apt-get update
+            apt-get install -y curl ca-certificates gnupg
+            install -m 0755 -d /etc/apt/keyrings
+            curl -fsSL https://download.docker.com/linux/debian/gpg -o /etc/apt/keyrings/docker.asc
+            chmod a+r /etc/apt/keyrings/docker.asc
+            echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.asc] https://download.docker.com/linux/debian bullseye stable" | tee /etc/apt/sources.list.d/docker.list > /dev/null
+            apt-get update
+            apt-cache madison docker-ce-cli | grep 20.10
+            apt-get install -y docker-ce-cli=5:20.10.24~3-0~debian-bullseye
+      - docker-buildx/install
+      - run:
+          name: Build Application
+          command: |
+            ./gradlew checkstyleMain
+            ./gradlew clean bootJar
+      - run:
+          name: Sanitize Branch Name
+          command: |
+            echo "export SANITIZED_BRANCH=$(echo $CIRCLE_BRANCH | sed 's/[^a-zA-Z0-9.-]/-/g' | tr '[:upper:]' '[:lower:]')" >> $BASH_ENV # Also ensure branch tag is lowercase
+      # First build and push with branch-latest tag
+      - docker-buildx/build-and-push:
+          image-name: "$DOCKER_ORG_LOWER/$DOCKER_REPO_LOWER"
+          tag: "${SANITIZED_BRANCH}-latest"
+      # Then build and push with branch-version tag
+      - docker-buildx/build-and-push:
+          image-name: "$DOCKER_ORG_LOWER/$DOCKER_REPO_LOWER"
+          tag: "${SANITIZED_BRANCH}"
+          # Add dockerhub credentials if needed
+          # dockerhub-username: "$DOCKERHUB_USERNAME"
+          # dockerhub-password: "$DOCKERHUB_PASSWORD"
+  build_and_push_latest_image:
+    executor: docker-executor
+    environment:
+      JVM_OPTS: -Xmx512m
+      TERM: dumb
+    steps:
+      - checkout
+      - setup_remote_docker:
+          version: 20.10.24
+      - run:
+          name: Set Lowercase Docker Image Vars
+          command: |
+            echo "export DOCKER_ORG_LOWER=$(echo $CIRCLE_PROJECT_USERNAME | tr '[:upper:]' '[:lower:]')" >> $BASH_ENV
+            echo "export DOCKER_REPO_LOWER=$(echo $CIRCLE_PROJECT_REPONAME | tr '[:upper:]' '[:lower:]')" >> $BASH_ENV
+            echo "Using Docker Namespace: $DOCKER_ORG_LOWER"
+            echo "Using Docker Repository: $DOCKER_REPO_LOWER"
+      - run:
+          name: Install Docker CLI
+          command: |
+            apt-get update
+            apt-get install -y curl ca-certificates gnupg
+            install -m 0755 -d /etc/apt/keyrings
+            curl -fsSL https://download.docker.com/linux/debian/gpg -o /etc/apt/keyrings/docker.asc
+            chmod a+r /etc/apt/keyrings/docker.asc
+            echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.asc] https://download.docker.com/linux/debian bullseye stable" | tee /etc/apt/sources.list.d/docker.list > /dev/null
+            apt-get update
+            apt-cache madison docker-ce-cli | grep 20.10
+            apt-get install -y docker-ce-cli=5:20.10.24~3-0~debian-bullseye
+      - docker-buildx/install
+      - run:
+          name: Build Application
+          command: |
+            ./gradlew checkstyleMain
+            ./gradlew clean bootJar
+      - docker-buildx/build-and-push:
+          # Using lowercase variables defined above
+          image-name: "$DOCKER_ORG_LOWER/$DOCKER_REPO_LOWER"
+          tag: "latest"
+          # Add dockerhub credentials if needed
+          # dockerhub-username: "$DOCKERHUB_USERNAME"
+          # dockerhub-password: "$DOCKERHUB_PASSWORD"
+workflows:
+  version: 2
+  build-and-push-pipeline:
+    jobs:
+      # Build tags matching vX.Y.Z format
+      - build_and_push_tag_image:
+          filters:
+            tags:
+              only: /^v\d+\.\d+\.\d+$/
+            branches:
+              ignore: /.*/
+          context:
+            - DOCKER
+      # Build any branch commit (except tags)
+      - build_and_push_branch_image:
+          filters:
+            tags:
+              ignore: /.*/
+            branches:
+              only: /.*/
+          context:
+            - DOCKER
+      # Build 'latest' only when the branch image succeeds AND it's the main/master branch
+      - build_and_push_latest_image:
+          requires:
+            - build_and_push_branch_image
+          filters:
+            tags:
+              ignore: /.*/
+            branches:
+              only:
+                - main # Or your primary branch name like 'master'
+          context:
+            - DOCKER

.github/pull_request_template.md

@@ -0,0 +1,22 @@
+## Description
+
+* PR title should have jira ticket enclosed in `[]`.<br>
+Format: ``` [jira_ticket] description```<br>
+ex: [phee-123] PR title.
+* Add a link to the Jira ticket.
+* Describe the changes made and why they were made.
+
+## Checklist
+
+Please make sure these boxes are checked before submitting your pull request - thanks!
+- [ ] Followed the PR title naming convention mentioned above.
+
+- [ ] Design related bullet points or design document link related to this PR added in the description above.
+
+- [ ] Updated corresponding Postman Collection or Api documentation for the changes in this PR.
+
+- [ ] Created/updated unit or integration tests for verifying the changes made.
+
+- [ ] Added required Swagger annotation and update API documentation with details of any API changes if applicable
+
+- [ ] Followed the naming conventions as given in https://docs.google.com/document/d/1Q4vaMSzrTxxh9TS0RILuNkSkYCxotuYk1Xe0CMIkkCU/edit?usp=sharing

.gitignore

@@ -36,4 +36,8 @@ build/
 .vscode/
 
 .DS_Store
-/.mvn
+/.mvn
+# Certificate files (use K8s secrets instead)
+*.jks
+*.p12
+*.keystore

Dockerfile

@@ -1,5 +1,5 @@
-FROM openjdk:13
+FROM eclipse-temurin:17-jdk
 EXPOSE 5000
 
-COPY target/*.jar .
+COPY build/libs/*.jar .
 CMD java -jar *.jar