From d6ee3f9cc94209e38ab06e89745ccc91196da9d3 Mon Sep 17 00:00:00 2001 From: Kamil Zabielski <50334623+limakzi@users.noreply.github.com> Date: Wed, 9 Apr 2025 02:01:45 +0200 Subject: [PATCH] chore: Simplify Dockerfile --- .github/workflows/main.yaml | 6 +----- src/dockerfiles/ubuntu-2204-lts/Dockerfile | 4 +--- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index ef81548..6dcd903 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -36,9 +36,6 @@ jobs: - 4.12.2 - 4.12.1 - 4.12.0 - platform: - - linux/amd64 - - linux/arm64 steps: - name: 👨‍💻 git -- checkout @@ -74,12 +71,11 @@ jobs: with: context: ./src/dockerfiles/${{ matrix.image }} file: ./src/dockerfiles/${{ matrix.image }}/Dockerfile - platforms: ${{ matrix.platform }} push: ${{ ! github.event_name == 'pull_request' }} tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} + platforms: linux/amd64,linux/arm64 cache-from: type=gha cache-to: type=gha,mode=max` build-args: | - PLATFORM=${{ matrix.platform }} GAP_VERSION=${{ matrix.gap-version }} diff --git a/src/dockerfiles/ubuntu-2204-lts/Dockerfile b/src/dockerfiles/ubuntu-2204-lts/Dockerfile index 943fb17..cb9a67f 100644 --- a/src/dockerfiles/ubuntu-2204-lts/Dockerfile +++ b/src/dockerfiles/ubuntu-2204-lts/Dockerfile @@ -1,5 +1,3 @@ -ARG PLATFORM="linux/arm64" - ## {{{ ARG GAP_USER_USERNAME="gap" ARG GAP_USER_GROUPNAME="gap" @@ -27,7 +25,7 @@ ARG PACKAGE_MANAGER_DOWNLOAD_URL="https://github.com/gap-packages/PackageManager -FROM --platform=${PLATFORM} ubuntu:22.04 AS base +FROM ubuntu:22.04 AS base ARG GAP_USER_GID ARG GAP_USER_GROUPNAME ARG GAP_USER_UID