From d0be636cc94e143dafac1b4b5ae53fe436733000 Mon Sep 17 00:00:00 2001 From: Kairo Araujo Date: Wed, 7 Feb 2024 13:54:35 +0100 Subject: [PATCH] feat: add support to arm/v7 and arm/v8 images Include support to arm/v7 and arm/v8 container images. It includes Apple M processors. Signed-off-by: Kairo Araujo --- .github/workflows/publish_container.yml | 2 +- .github/workflows/publish_docker_dev.yml | 2 +- .github/workflows/test_docker_build.yml | 2 +- Dockerfile | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/publish_container.yml b/.github/workflows/publish_container.yml index e646a0d9..f9167848 100644 --- a/.github/workflows/publish_container.yml +++ b/.github/workflows/publish_container.yml @@ -52,7 +52,7 @@ jobs: with: context: . push: true - platforms: linux/amd64,linux/arm64 + platforms: linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v8 tags: | ghcr.io/repository-service-tuf/repository-service-tuf-worker:${{ inputs.image_version }} build-args: | diff --git a/.github/workflows/publish_docker_dev.yml b/.github/workflows/publish_docker_dev.yml index 7b099f61..e5be7934 100644 --- a/.github/workflows/publish_docker_dev.yml +++ b/.github/workflows/publish_docker_dev.yml @@ -45,7 +45,7 @@ jobs: with: context: . push: true - platforms: linux/amd64,linux/arm64 + platforms: linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v8 tags: | ghcr.io/repository-service-tuf/repository-service-tuf-worker:dev build-args: | diff --git a/.github/workflows/test_docker_build.yml b/.github/workflows/test_docker_build.yml index 4a153e24..7b7e7c9a 100644 --- a/.github/workflows/test_docker_build.yml +++ b/.github/workflows/test_docker_build.yml @@ -25,7 +25,7 @@ jobs: with: context: . push: false - platforms: linux/amd64,linux/arm64 + platforms: linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v8 tags: | ghcr.io/repository-service-tuf/repository-service-tuf-worker:test build-args: | diff --git a/Dockerfile b/Dockerfile index b7c47a23..c543c75e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,8 +11,8 @@ ENV PYTHONDONTWRITEBYTECODE=1 ADD requirements.txt /builder/requirements.txt WORKDIR /builder -RUN apt-get update && apt-get install gcc libpq-dev -y -RUN pip install --upgrade pip && pip install --user -r requirements.txt +RUN apt-get update && apt-get install gcc libpq-dev libffi-dev -y +RUN pip install --upgrade pip cmake && pip install --user -r requirements.txt RUN apt-get remove gcc --purge -y \ && rm -rf /var/lib/apt/lists/* \ && apt-get clean autoclean \