From 823db6385185b69ab0601bbfd21e2735541afad1 Mon Sep 17 00:00:00 2001 From: Muhamad Aditya Prima Date: Fri, 23 May 2025 10:36:49 +0700 Subject: [PATCH] Updated action workflows --- .gitea/workflows/master.yaml | 152 +++++++++++++----- ...ckerfile.almalinux => Dockerfile.almalinux | 3 +- 8/Dockerfile.alpine => Dockerfile.alpine | 0 3 files changed, 113 insertions(+), 42 deletions(-) rename 8/Dockerfile.almalinux => Dockerfile.almalinux (94%) rename 8/Dockerfile.alpine => Dockerfile.alpine (100%) diff --git a/.gitea/workflows/master.yaml b/.gitea/workflows/master.yaml index a87a451..473602b 100644 --- a/.gitea/workflows/master.yaml +++ b/.gitea/workflows/master.yaml @@ -13,6 +13,56 @@ jobs: strategy: matrix: params: + - os: "alpine" + os_version: "3.9" + os_label: "true" + php_version: "7.2" + php_short_version: "7" + php_release: "7" + composer_version: "2.8.9" + - os: "alpine" + os_version: "3.12" + os_label: "true" + php_version: "7.3" + php_short_version: "7" + php_release: "7" + composer_version: "2.8.9" + - os: "alpine" + os_version: "3.15" + os_label: "true" + php_version: "7.4" + php_short_version: "7" + php_release: "7" + php_major: 'true' + composer_version: "2.8.9" + - os: "alpine" + os_version: "3.16" + os_label: "true" + php_version: "8.0" + php_short_version: "8" + php_release: "8" + composer_version: "2.8.9" + - os: "alpine" + os_version: "3.19" + os_label: "true" + php_version: "8.1" + php_short_version: "81" + php_release: "8" + composer_version: "2.8.9" + - os: "alpine" + os_version: "3.21" + os_label: "true" + php_version: "8.2" + php_short_version: "82" + php_release: "8" + composer_version: "2.8.9" + - os: "alpine" + os_version: "3.21" + os_label: "true" + php_version: "8.3" + php_short_version: "83" + php_release: "8" + composer_version: "2.8.9" - os: "alpine" os_version: "3.21" os_label: "true" @@ -22,43 +72,51 @@ jobs: php_major: 'true' composer_version: "2.8.9" latest: 'true' - # - os: "almalinux" - # os_version: "8.10" - # php_version: "7.2" - # php_release: "7" - # composer_version: "2.8.9" - # - os: "almalinux" - # os_version: "8.10" - # php_version: "7.3" - # php_release: "7" - # composer_version: "2.8.9" - # - os: "almalinux" - # os_version: "8.10" - # php_version: "7.4" - # php_release: "7" - # composer_version: "2.8.9" - # - os: "almalinux" - # os_version: "9.5" - # php_version: "8.0" - # php_release: "8" - # composer_version: "2.8.9" - # - os: "almalinux" - # os_version: "9.5" - # php_version: "8.1" - # php_release: "8" - # composer_version: "2.8.9" - # - os: "almalinux" - # os_version: "9.5" - # php_version: "8.2" - # php_release: "8" - # composer_version: "2.8.9" - # - os: "almalinux" - # os_version: "9.5" - # php_version: "8.3" - # php_release: "8" - # composer_version: "2.8.9" + - os: "almalinux" + os_version: "8.10" + os_short_version: "8" + php_version: "7.2" + php_release: "7" + composer_version: "2.8.9" + - os: "almalinux" + os_version: "8.10" + os_short_version: "8" + php_version: "7.3" + php_release: "7" + composer_version: "2.8.9" - os: "almalinux" os_version: "9.5" + os_short_version: "9" + php_version: "7.4" + php_release: "7" + composer_version: "2.8.9" + - os: "almalinux" + os_version: "9.5" + os_short_version: "9" + php_version: "8.0" + php_release: "8" + composer_version: "2.8.9" + - os: "almalinux" + os_version: "9.5" + os_short_version: "9" + php_version: "8.1" + php_release: "8" + composer_version: "2.8.9" + - os: "almalinux" + os_version: "9.5" + os_short_version: "9" + php_version: "8.2" + php_release: "8" + composer_version: "2.8.9" + - os: "almalinux" + os_version: "9.5" + os_short_version: "9" + php_version: "8.3" + php_release: "8" + composer_version: "2.8.9" + - os: "almalinux" + os_version: "9.5" + os_short_version: "9" php_version: "8.4" php_release: "8" php_major: 'true' @@ -81,10 +139,12 @@ jobs: with: push: true context: . - file: ${{ matrix.params.php_release }}/Dockerfile.${{ matrix.params.os }} + file: Dockerfile.${{ matrix.params.os }} build-args: | OS_VERSION=${{ matrix.params.os_version }} + OS_SHORT_VERSION=${{ matirx.params.os_short_version }} PHP_VERSION=${{ matrix.params.php_version }} + PHP_SHORT_VERSION=${{ matrix.params.php_short_version }} COMPOSER_VERSION=${{ matrix.params.composer_version }} tags: | quay.io/teras/php:${{ matrix.params.php_version }} @@ -94,10 +154,12 @@ jobs: with: push: true context: . - file: ${{ matrix.params.php_release }}/Dockerfile.${{ matrix.params.os }} + file: Dockerfile.${{ matrix.params.os }} build-args: | OS_VERSION=${{ matrix.params.os_version }} + OS_SHORT_VERSION=${{ matirx.params.os_short_version }} PHP_VERSION=${{ matrix.params.php_version }} + PHP_SHORT_VERSION=${{ matrix.params.php_short_version }} COMPOSER_VERSION=${{ matrix.params.composer_version }} tags: | quay.io/teras/php:${{ matrix.params.php_version }}-${{ matrix.params.os }} @@ -107,10 +169,12 @@ jobs: with: push: true context: . - file: ${{ matrix.params.php_release }}/Dockerfile.${{ matrix.params.os }} + file: Dockerfile.${{ matrix.params.os }} build-args: | OS_VERSION=${{ matrix.params.os_version }} + OS_SHORT_VERSION=${{ matirx.params.os_short_version }} PHP_VERSION=${{ matrix.params.php_version }} + PHP_SHORT_VERSION=${{ matrix.params.php_short_version }} COMPOSER_VERSION=${{ matrix.params.composer_version }} tags: | quay.io/teras/php:${{ matrix.params.php_release }} @@ -120,10 +184,12 @@ jobs: with: push: true context: . - file: ${{ matrix.params.php_release }}/Dockerfile.${{ matrix.params.os }} + file: Dockerfile.${{ matrix.params.os }} build-args: | OS_VERSION=${{ matrix.params.os_version }} + OS_SHORT_VERSION=${{ matirx.params.os_short_version }} PHP_VERSION=${{ matrix.params.php_version }} + PHP_SHORT_VERSION=${{ matrix.params.php_short_version }} COMPOSER_VERSION=${{ matrix.params.composer_version }} tags: | quay.io/teras/php:${{ matrix.params.php_release }}-${{ matrix.params.os }} @@ -133,10 +199,12 @@ jobs: with: push: true context: . - file: ${{ matrix.params.php_release }}/Dockerfile.${{ matrix.params.os }} + file: Dockerfile.${{ matrix.params.os }} build-args: | OS_VERSION=${{ matrix.params.os_version }} + OS_SHORT_VERSION=${{ matirx.params.os_short_version }} PHP_VERSION=${{ matrix.params.php_version }} + PHP_SHORT_VERSION=${{ matrix.params.php_short_version }} COMPOSER_VERSION=${{ matrix.params.composer_version }} tags: | quay.io/teras/php:latest @@ -146,10 +214,12 @@ jobs: with: push: true context: . - file: ${{ matrix.params.php_release }}/Dockerfile.${{ matrix.params.os }} + file: Dockerfile.${{ matrix.params.os }} build-args: | OS_VERSION=${{ matrix.params.os_version }} + OS_SHORT_VERSION=${{ matirx.params.os_short_version }} PHP_VERSION=${{ matrix.params.php_version }} + PHP_SHORT_VERSION=${{ matrix.params.php_short_version }} COMPOSER_VERSION=${{ matrix.params.composer_version }} tags: | quay.io/teras/php:latest-${{ matrix.params.os }} diff --git a/8/Dockerfile.almalinux b/Dockerfile.almalinux similarity index 94% rename from 8/Dockerfile.almalinux rename to Dockerfile.almalinux index e365dac..6dec7db 100644 --- a/8/Dockerfile.almalinux +++ b/Dockerfile.almalinux @@ -2,6 +2,7 @@ ARG OS_VERSION=9.5 FROM quay.io/teras/almalinux:${OS_VERSION}-minimal AS builder +ARG OS_SHORT_VERSION=9 ARG PHP_VERSION=8.4 ARG COMPOSER_VERSION=2.8.9 @@ -26,7 +27,7 @@ RUN /bin/mkdir -p ${COMPOSER_CACHE_DIR} ${COMPOSER_VENDOR_DIR} ${COMPOSER_BIN_DI /bin/microdnf -y --nodocs install epel-release; \ /bin/microdnf -y upgrade; \ /bin/rpm -Uvh --replacepkgs --replacefiles \ - https://rpms.remirepo.net/enterprise/remi-release-9.rpm; \ + https://rpms.remirepo.net/enterprise/remi-release-${OS_SHORT_VERSION}.rpm; \ /bin/microdnf -y module reset php; \ /bin/microdnf -y module enable php:remi-${PHP_VERSION}; \ /bin/microdnf -y --nodocs install \ diff --git a/8/Dockerfile.alpine b/Dockerfile.alpine similarity index 100% rename from 8/Dockerfile.alpine rename to Dockerfile.alpine