From 057d4c3b53dc58da17e07f7c3ae0028d97d021a8 Mon Sep 17 00:00:00 2001
From: erikzaadi <erik@getport.io>
Date: Sun, 27 Oct 2024 08:03:33 +0200
Subject: [PATCH] [PR-FIXES]

---
 .github/workflows/actions/build-docker-image/action.yml | 4 ----
 .github/workflows/ci.yml                                | 3 +--
 .github/workflows/docker-images-security-scan.yml       | 5 ++---
 .github/workflows/infra.yml                             | 4 +---
 .github/workflows/release-integrations.yml              | 2 +-
 integrations/_infra/Dockerfile.base.builder             | 1 +
 integrations/_infra/Dockerfile.base.runner              | 1 +
 7 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/actions/build-docker-image/action.yml b/.github/workflows/actions/build-docker-image/action.yml
index 27aa37e03d..9d1114a2bb 100644
--- a/.github/workflows/actions/build-docker-image/action.yml
+++ b/.github/workflows/actions/build-docker-image/action.yml
@@ -41,10 +41,6 @@ inputs:
 runs:
   using: 'composite'
   steps:
-    # - name: Setup docker (missing on MacOS)
-    #   if: matrix.platform == 'linux/arm64'
-    #   uses: douglascamata/setup-docker-macos-action@v1-alpha
-
     - name: Set up QEMU
       uses: docker/setup-qemu-action@v3
       if: ${{ inputs.skip-init == '' }}
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f1bf2cb5c4..d012096aa3 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -36,7 +36,6 @@ jobs:
           echo $(echo ${integrations_to_build[@]} | jq -R -c 'split(" ")')
           echo "INTEGRATIONS_MATRIX=$(echo ${integrations_to_build[@]} | jq -R -c 'split(" ")')" >> $GITHUB_OUTPUT
 
-
   build-integration:
     runs-on: 'ubuntu-latest'
     if: needs.prepare-matrix.outputs.matrix != '[]'
@@ -101,4 +100,4 @@ jobs:
             INTEGRATION_VERSION=${{ steps.prepare_tags.outputs.version }}
           docker-user: ${{ secrets.DOCKER_MACHINE_USER }}
           docker-password: ${{ secrets.DOCKER_MACHINE_TOKEN }}
-          skip-push: 'yupp'
+          skip-push: 'true'
diff --git a/.github/workflows/docker-images-security-scan.yml b/.github/workflows/docker-images-security-scan.yml
index 4cae7a1efd..61bdef898e 100644
--- a/.github/workflows/docker-images-security-scan.yml
+++ b/.github/workflows/docker-images-security-scan.yml
@@ -78,7 +78,6 @@ jobs:
       - name: Checkout Repo
         uses: actions/checkout@v4
 
-
       - name: Extract version and image tag
         id: enrich-version
         run: |
@@ -96,9 +95,9 @@ jobs:
         with:
           dockerfile: ./integrations/_infra/Dockerfile
           platforms: linux/amd64
-          skip-push: 'yupp'
+          skip-push: 'true'
           tags: ${{ steps.enrich-version.outputs.image_tag }}
-          load-created-image: 'yupp'
+          load-created-image: 'true'
           docker-user: ${{ secrets.DOCKER_MACHINE_USER }}
           docker-password: ${{ secrets.DOCKER_MACHINE_TOKEN }}
           build-args: |
diff --git a/.github/workflows/infra.yml b/.github/workflows/infra.yml
index fe4fac875c..58603c7ea7 100644
--- a/.github/workflows/infra.yml
+++ b/.github/workflows/infra.yml
@@ -7,7 +7,6 @@ jobs:
   detect-changes:
     uses: ./.github/workflows/detect-changes-matrix.yml
   build-infra:
-    # runs-on: ${{ matrix.platform == 'linux/arm64' && 'macos-13' || 'ubuntu-latest' }}
     runs-on: 'ubuntu-latest'
     needs: detect-changes
     if: ${{ needs.detect-changes.outputs.infra == 'true' }}
@@ -24,7 +23,6 @@ jobs:
           docker-user: ${{ secrets.DOCKER_MACHINE_USER }}
           docker-password: ${{ secrets.DOCKER_MACHINE_TOKEN }}
 
-
       - name: Build Docker Image
         uses: ./.github/workflows/actions/build-docker-image
         with:
@@ -33,4 +31,4 @@ jobs:
           tags: ghcr.io/port-labs/port-ocean-base-runner:latest
           docker-user: ${{ secrets.DOCKER_MACHINE_USER }}
           docker-password: ${{ secrets.DOCKER_MACHINE_TOKEN }}
-          skip-init: 'yupp'
+          skip-init: 'true'
diff --git a/.github/workflows/release-integrations.yml b/.github/workflows/release-integrations.yml
index f87f2f4446..8047414391 100644
--- a/.github/workflows/release-integrations.yml
+++ b/.github/workflows/release-integrations.yml
@@ -52,7 +52,7 @@ jobs:
     needs: [prepare-matrix]
     strategy:
       # limit the number of parallel jobs to avoid hitting the ghcr.io rate limit
-      max-parallel: 10
+      max-parallel: 5
       matrix:
         integration: ${{fromJson(needs.prepare-matrix.outputs.matrix)}}
     steps:
diff --git a/integrations/_infra/Dockerfile.base.builder b/integrations/_infra/Dockerfile.base.builder
index 4121f52e31..a2ade3fe93 100644
--- a/integrations/_infra/Dockerfile.base.builder
+++ b/integrations/_infra/Dockerfile.base.builder
@@ -1,4 +1,5 @@
 ARG BASE_PYTHON_IMAGE=debian:trixie-slim
+# debian:trixie-slim - Python 3.12
 FROM ${BASE_PYTHON_IMAGE}
 
 LABEL org.opencontainers.image.source=https://github.com/port-labs/ocean
diff --git a/integrations/_infra/Dockerfile.base.runner b/integrations/_infra/Dockerfile.base.runner
index 48061584de..61116df843 100644
--- a/integrations/_infra/Dockerfile.base.runner
+++ b/integrations/_infra/Dockerfile.base.runner
@@ -1,4 +1,5 @@
 ARG BASE_PYTHON_IMAGE=debian:trixie-slim
+# debian:trixie-slim - Python 3.12
 FROM ${BASE_PYTHON_IMAGE}
 
 LABEL org.opencontainers.image.source=https://github.com/port-labs/ocean