Skip to content

Commit 79ad162

Browse files
committed
[PR-FIXES]
1 parent 78ad401 commit 79ad162

File tree

7 files changed

+9
-14
lines changed

7 files changed

+9
-14
lines changed

.github/workflows/actions/build-docker-image/action.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,6 @@ inputs:
4141
runs:
4242
using: 'composite'
4343
steps:
44-
# - name: Setup docker (missing on MacOS)
45-
# if: matrix.platform == 'linux/arm64'
46-
# uses: douglascamata/setup-docker-macos-action@v1-alpha
47-
4844
- name: Set up QEMU
4945
uses: docker/setup-qemu-action@v3
5046
if: ${{ inputs.skip-init == '' }}

.github/workflows/infra.yml renamed to .github/workflows/build-infra-images.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ jobs:
77
detect-changes:
88
uses: ./.github/workflows/detect-changes-matrix.yml
99
build-infra:
10-
# runs-on: ${{ matrix.platform == 'linux/arm64' && 'macos-13' || 'ubuntu-latest' }}
1110
runs-on: 'ubuntu-latest'
1211
needs: detect-changes
1312
if: ${{ needs.detect-changes.outputs.infra == 'true' }}
@@ -24,7 +23,6 @@ jobs:
2423
docker-user: ${{ secrets.DOCKER_MACHINE_USER }}
2524
docker-password: ${{ secrets.DOCKER_MACHINE_TOKEN }}
2625

27-
2826
- name: Build Docker Image
2927
uses: ./.github/workflows/actions/build-docker-image
3028
with:
@@ -33,4 +31,4 @@ jobs:
3331
tags: ghcr.io/port-labs/port-ocean-base-runner:latest
3432
docker-user: ${{ secrets.DOCKER_MACHINE_USER }}
3533
docker-password: ${{ secrets.DOCKER_MACHINE_TOKEN }}
36-
skip-init: 'yupp'
34+
skip-init: 'true'

.github/workflows/ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
name: Build integration images
22
on:
33
pull_request:
4+
workflow_dispatch:
45

56
jobs:
67
prepare-matrix:
@@ -36,9 +37,8 @@ jobs:
3637
echo $(echo ${integrations_to_build[@]} | jq -R -c 'split(" ")')
3738
echo "INTEGRATIONS_MATRIX=$(echo ${integrations_to_build[@]} | jq -R -c 'split(" ")')" >> $GITHUB_OUTPUT
3839
39-
4040
build-integration:
41-
runs-on: 'ubuntu-latest'
41+
runs-on: ubuntu-latest
4242
if: needs.prepare-matrix.outputs.matrix != '[]'
4343
outputs:
4444
is_dev_version: ${{ steps.prepare_tags.outputs.is_dev_version }}
@@ -101,4 +101,4 @@ jobs:
101101
INTEGRATION_VERSION=${{ steps.prepare_tags.outputs.version }}
102102
docker-user: ${{ secrets.DOCKER_MACHINE_USER }}
103103
docker-password: ${{ secrets.DOCKER_MACHINE_TOKEN }}
104-
skip-push: 'yupp'
104+
skip-push: 'true'

.github/workflows/docker-images-security-scan.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,6 @@ jobs:
7878
- name: Checkout Repo
7979
uses: actions/checkout@v4
8080

81-
8281
- name: Extract version and image tag
8382
id: enrich-version
8483
run: |
@@ -96,9 +95,9 @@ jobs:
9695
with:
9796
dockerfile: ./integrations/_infra/Dockerfile
9897
platforms: linux/amd64
99-
skip-push: 'yupp'
98+
skip-push: 'true'
10099
tags: ${{ steps.enrich-version.outputs.image_tag }}
101-
load-created-image: 'yupp'
100+
load-created-image: 'true'
102101
docker-user: ${{ secrets.DOCKER_MACHINE_USER }}
103102
docker-password: ${{ secrets.DOCKER_MACHINE_TOKEN }}
104103
build-args: |

.github/workflows/release-integrations.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252
needs: [prepare-matrix]
5353
strategy:
5454
# limit the number of parallel jobs to avoid hitting the ghcr.io rate limit
55-
max-parallel: 10
55+
max-parallel: 5
5656
matrix:
5757
integration: ${{fromJson(needs.prepare-matrix.outputs.matrix)}}
5858
steps:

integrations/_infra/Dockerfile.base.builder

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
ARG BASE_PYTHON_IMAGE=debian:trixie-slim
2+
# debian:trixie-slim - Python 3.12
23
FROM ${BASE_PYTHON_IMAGE}
34

45
LABEL org.opencontainers.image.source=https://github.com/port-labs/ocean

integrations/_infra/Dockerfile.base.runner

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
ARG BASE_PYTHON_IMAGE=debian:trixie-slim
2+
# debian:trixie-slim - Python 3.12
23
FROM ${BASE_PYTHON_IMAGE}
34

45
LABEL org.opencontainers.image.source=https://github.com/port-labs/ocean

0 commit comments

Comments
 (0)