Get rid of skaffold, use docker compose to build and pure helm to deploy (#96)

* add compose build

* get rid off skaffold

* debug just for sure

* input bool

* update input label

* test dynamic version

* ready to merge

* push latest

Author: dczupryn-dt

.github/actions/build-push-images/action.yaml

@@ -0,0 +1,70 @@
+name: "Build and Push Docker Images"
+description: "Build Docker images using docker compose and optionally push to registry"
+inputs:
+  push:
+    description: "Whether to push images to registry"
+    required: false
+    default: "false"
+  tag:
+    description: "Tag for all Docker images"
+    required: true
+  push-latest:
+    description: "Whether to also push images with 'latest' tag"
+    required: false
+    default: "false"
+  registry:
+    description: "Docker registry URL"
+    required: false
+    default: "europe-docker.pkg.dev/dynatrace-demoability/docker/easytrade"
+  compose-file:
+    description: "Path to docker compose file"
+    required: false
+    default: "compose.build.yaml"
+
+outputs:
+  images:
+    description: "List of built images"
+    value: ${{ steps.build.outputs.images }}
+
+runs:
+  using: composite
+  steps:
+    - name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@v3
+
+    - name: Build Docker images
+      id: build
+      shell: bash
+      env:
+        REGISTRY: ${{ inputs.registry }}
+        TAG: ${{ inputs.tag }}
+      run: |
+        echo "Building images with tag: $TAG"
+        docker compose -f ${{ inputs.compose-file }} build
+
+        # List built images
+        IMAGES=$(docker compose -f ${{ inputs.compose-file }} config --services | tr '\n' ',' | sed 's/,$//')
+        echo "images=$IMAGES" >> $GITHUB_OUTPUT
+        echo "Built images: $IMAGES"
+
+    - name: Push Docker images
+      if: inputs.push == 'true'
+      shell: bash
+      env:
+        REGISTRY: ${{ inputs.registry }}
+        TAG: ${{ inputs.tag }}
+      run: |
+        echo "Pushing images to registry..."
+        docker compose -f ${{ inputs.compose-file }} push
+        echo "Successfully pushed all images with tag: $TAG"
+
+    - name: Push Docker images with latest tag
+      if: inputs.push == 'true' && inputs.push-latest == 'true'
+      shell: bash
+      env:
+        REGISTRY: ${{ inputs.registry }}
+        TAG: latest
+      run: |
+        echo "Pushing images to registry..."
+        docker compose -f ${{ inputs.compose-file }} push
+        echo "Successfully pushed all images with tag: $TAG"

.github/workflows/build-on-branch.yaml

@@ -19,8 +19,7 @@ on:
         required: true
 
 env:
-  SKAFFOLD_DEFAULT_REPO: europe-docker.pkg.dev/dynatrace-demoability/docker/easytrade
-  SKAFFOLD_VERSION: 2.13.2
+  CONTAINER_REGISTRY: europe-docker.pkg.dev/dynatrace-demoability/docker/easytrade
   HELM_CHART_PATH: helm/easytrade
 
 jobs:
@@ -37,14 +36,14 @@ jobs:
     runs-on: ubuntu-24.04
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Build easytrade without pushing to docker repository
-        uses: hiberbee/github[email protected]
+        uses: ./.github/actions/build-push-images
         with:
-          command: build
           push: false
-          skaffold-version: ${{ env.SKAFFOLD_VERSION }}
+          tag: dev
+          registry: ${{ env.CONTAINER_REGISTRY }}
 
   build-helm-chart:
     runs-on: ubuntu-24.04

.github/workflows/build-on-main.yaml

@@ -10,6 +10,12 @@ on:
       - src/**
       - helm/**
   workflow_dispatch:
+    inputs:
+      run-tests:
+        description: "Run integration tests after deployment?"
+        required: false
+        type: boolean
+        default: true
 
   workflow_call:
     secrets:
@@ -33,9 +39,10 @@ on:
 env:
   GAR_ADDRESS: europe-docker.pkg.dev
   NAMESPACE: easytrade
-  SKAFFOLD_DEFAULT_REPO: europe-docker.pkg.dev/dynatrace-demoability/docker/easytrade
-  SKAFFOLD_VERSION: 2.13.2
+  CONTAINER_REGISTRY: europe-docker.pkg.dev/dynatrace-demoability/docker/easytrade
+  HELM_REGISTRY: oci://europe-docker.pkg.dev/dynatrace-demoability/helm
   HELM_CHART_PATH: helm/easytrade
+  VERSION: 1.2.${{ github.run_number }}
 
 jobs:
   snyk:
@@ -51,7 +58,7 @@ jobs:
     runs-on: ubuntu-24.04
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Retrieve gar credentials
         run: |
@@ -60,72 +67,59 @@ jobs:
       - name: Set application version
         uses: ./.github/actions/set-version
         with:
-          version: 1.2.${{ github.run_number }}
+          version: ${{ env.VERSION }}
 
-      - name: "Build easytrade and push it to Docker registry with commit tag"
-        uses: hiberbee/github[email protected]
+      - name: Build and push easytrade to docker repository
+        uses: ./.github/actions/build-push-images
         with:
-          command: build
           push: true
-          skaffold-version: ${{ env.SKAFFOLD_VERSION }}
-
-      - name: "Build easytrade and push it to Docker registry with latest tag"
-        uses: hiberbee/[email protected]
-        with:
-          command: build
-          tag: latest
-          push: true
-          skaffold-version: ${{ env.SKAFFOLD_VERSION }}
+          push-latest: true
+          tag: ${{ env.VERSION }}
+          registry: ${{ env.CONTAINER_REGISTRY }}
 
       - name: Build and push Helm chart
         uses: ./.github/actions/build-push-helm
         with:
           chart-path: ${{ env.HELM_CHART_PATH }}
           push: true
           registry-url: oci://europe-docker.pkg.dev/dynatrace-demoability/helm
-          version: 1.2.${{ github.run_number }}
+          version: ${{ env.VERSION }}
           credentials: ${{ secrets.GAR_CREDENTIALS }}
 
   deploy-easytrade:
     runs-on: ubuntu-24.04
     needs: build-easytrade
     steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-        with:
-          path: easytrade
-
       - name: Retrieve kubeconfig
         run: |
           mkdir ~/.kube
           echo "${{ secrets.KUBECONFIG }}" > ~/.kube/config
 
       - name: Checkout infrastructure repo
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           ssh-key: ${{ secrets.SSH_PRIVATE_KEY }}
           repository: dynatrace/easytrade-infrastructure
           path: easytrade-infrastructure
 
-      - name: Export short commit SHA
-        run: echo "COMMIT_SHA_SHORT=$(echo $GITHUB_SHA | cut -c 1-7)" >> $GITHUB_ENV
-
       - name: Deploy easytrade
-        uses: hiberbee/[email protected]
-        with:
-          command: deploy
-          tag: ${{ env.COMMIT_SHA_SHORT }}
-          namespace: ${{ env.NAMESPACE }}
-          profile: aws-staging
-
-          working-directory: ${{ github.workspace }}/easytrade
+        shell: bash
+        env:
+          HELM_CHART_VERSION: ${{ env.VERSION }}
+          BASE_VALUES_FILE: "./helm-values/aws-base.yaml"
+          OVERRIDES_VALUES_FILE: "./helm-values/aws-staging.yaml"
+          DRY_RUN: "false"
+          DEBUG_MODE: "false"
+        run: ./deploy.sh
+        working-directory: ${{ github.workspace }}/easytrade-infrastructure
 
   run-tests:
+    if: ${{ inputs.run-tests == 'true' }}
     runs-on: ubuntu-24.04
     needs: deploy-easytrade
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Retrieve kubeconfig
         run: |

compose.build.yaml

@@ -0,0 +1,95 @@
+services:
+  accountservice:
+    image: ${REGISTRY}/accountservice:${TAG}
+    build:
+      context: src/accountservice
+
+  aggregator-service:
+    image: ${REGISTRY}/aggregator-service:${TAG}
+    build:
+      context: src/aggregator-service
+
+  broker-service:
+    image: ${REGISTRY}/broker-service:${TAG}
+    build:
+      context: src/broker-service
+
+  calculationservice:
+    image: ${REGISTRY}/calculationservice:${TAG}
+    build:
+      context: src/calculationservice
+
+  contentcreator:
+    image: ${REGISTRY}/contentcreator:${TAG}
+    build:
+      context: src/contentcreator
+
+  credit-card-order-service:
+    image: ${REGISTRY}/credit-card-order-service:${TAG}
+    build:
+      context: src/credit-card-order-service
+
+  db:
+    image: ${REGISTRY}/db:${TAG}
+    build:
+      context: src/db
+
+  engine:
+    image: ${REGISTRY}/engine:${TAG}
+    build:
+      context: src/engine
+
+  feature-flag-service:
+    image: ${REGISTRY}/feature-flag-service:${TAG}
+    build:
+      context: src/feature-flag-service
+
+  frontend:
+    image: ${REGISTRY}/frontend:${TAG}
+    build:
+      context: src/frontend
+
+  frontendreverseproxy:
+    image: ${REGISTRY}/frontendreverseproxy:${TAG}
+    build:
+      context: src/frontendreverseproxy
+
+  loadgen:
+    image: ${REGISTRY}/loadgen:${TAG}
+    build:
+      context: src/loadgen
+
+  loginservice:
+    image: ${REGISTRY}/loginservice:${TAG}
+    build:
+      context: src/loginservice
+
+  manager:
+    image: ${REGISTRY}/manager:${TAG}
+    build:
+      context: src/manager/easyTradeManager
+
+  offerservice:
+    image: ${REGISTRY}/offerservice:${TAG}
+    build:
+      context: src/offerservice
+
+  pricing-service:
+    image: ${REGISTRY}/pricing-service:${TAG}
+    build:
+      context: src/pricing-service
+
+  problem-operator:
+    image: ${REGISTRY}/problem-operator:${TAG}
+    build:
+      context: src/problem-operator
+
+  rabbitmq:
+    image: ${REGISTRY}/rabbitmq:${TAG}
+    build:
+      context: src/rabbitmq
+
+  third-party-service:
+    image: ${REGISTRY}/third-party-service:${TAG}
+    build:
+      context: src/third-party-service