Skip to content

Commit 1355b12

Browse files
committed
No more github action cache for docker builds
1 parent cec3e26 commit 1355b12

File tree

3 files changed

+19
-10
lines changed

3 files changed

+19
-10
lines changed

.github/workflows/ci.yml

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,8 @@ jobs:
3939
4040
4141
build-integration:
42-
runs-on: ubuntu-latest
42+
# runs-on: ${{ matrix.platform == 'linux/arm64' && 'macos-13' || 'ubuntu-latest' }}
43+
runs-on: 'ubuntu-latest'
4344
if: needs.prepare-matrix.outputs.matrix != '[]'
4445
outputs:
4546
is_dev_version: ${{ steps.prepare_tags.outputs.is_dev_version }}
@@ -57,6 +58,10 @@ jobs:
5758
- name: Check out code
5859
uses: actions/checkout@v4
5960

61+
# - name: Setup docker (missing on MacOS)
62+
# if: matrix.platform == 'linux/arm64'
63+
# uses: douglascamata/setup-docker-macos-action@v1-alpha
64+
6065
- name: Set up QEMU
6166
uses: docker/setup-qemu-action@v3
6267
with:
@@ -106,10 +111,17 @@ jobs:
106111
run: |
107112
echo "base_image=$(cat ${{ steps.prepare_tags.outputs.dockerfile_path }} | head -n 1 | awk -F '=' '{print $2}' )" >> $GITHUB_OUTPUT
108113
109-
- name: Cache Docker images
110-
uses: ScribeMD/docker-cache@0.5.0
114+
- name: Login to Docker Hub
115+
uses: docker/login-action@v3
111116
with:
112-
key: docker-${{ matrix.integration }}-${{ steps.get-docker-image.outputs.base_image }}-${{ matrix.platform }}
117+
registry: ghcr.io
118+
username: ${{ secrets.DOCKER_MACHINE_USER }}
119+
password: ${{ secrets.DOCKER_MACHINE_TOKEN }}
120+
121+
# - name: Cache Docker images
122+
# uses: ScribeMD/docker-cache@0.5.0
123+
# with:
124+
# key: docker-${{ matrix.integration }}-${{ steps.get-docker-image.outputs.base_image }}-${{ matrix.platform }}
113125

114126
- name: Build
115127
uses: docker/build-push-action@v6
@@ -119,8 +131,6 @@ jobs:
119131
platforms: ${{ matrix.platform }}
120132
push: false
121133
load: true
122-
cache-from: type=gha
123-
cache-to: type=gha,mode=max
124134
tags: ${{ steps.prepare_tags.outputs.tags }}
125135
build-args: |
126136
BUILD_CONTEXT=${{ steps.prepare_tags.outputs.context_dir }}

.github/workflows/release-integrations.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ jobs:
5757
needs: [prepare-matrix]
5858
strategy:
5959
# limit the number of parallel jobs to avoid hitting the ghcr.io rate limit
60-
max-parallel: 5
60+
max-parallel: 10
6161
matrix:
6262
integration: ${{fromJson(needs.prepare-matrix.outputs.matrix)}}
6363
steps:
@@ -115,8 +115,6 @@ jobs:
115115
file: ${{ steps.prepare_tags.outputs.dockerfile_path }}
116116
platforms: linux/amd64,linux/arm64
117117
push: true
118-
cache-from: type=gha
119-
cache-to: type=gha,mode=max
120118
tags: ${{ steps.prepare_tags.outputs.tags }}
121119
build-args: |
122120
BUILD_CONTEXT=${{ steps.prepare_tags.outputs.context_dir }}

integrations/_infra/Dockerfile.Deb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ ENV LIBRDKAFKA_VERSION=1.9.2 \
1212

1313
RUN apt-get update \
1414
&& apt-get install -y \
15+
--no-install-recommends \
1516
wget \
1617
g++ \
1718
libssl-dev \
@@ -45,7 +46,7 @@ LABEL org.opencontainers.image.source=https://github.com/port-labs/ocean
4546
ENV PIP_ROOT_USER_ACTION=ignore
4647

4748
RUN apt-get update \
48-
&& apt-get install -y librdkafka-dev python3 \
49+
&& apt-get install -y --no-install-recommends librdkafka-dev python3 \
4950
&& apt-get clean
5051

5152
WORKDIR /app

0 commit comments

Comments
 (0)