From 27d4d51c648bd78e8fb8bd7c64a4e7af9d685945 Mon Sep 17 00:00:00 2001 From: Muhamad Aditya Prima Date: Wed, 3 Dec 2025 15:58:59 +0700 Subject: [PATCH] chore: add php8.5 for almalinux version --- .gitea/workflows/master.yaml | 338 ++++++++++++++++++----------------- Dockerfile.micro | 17 +- 2 files changed, 185 insertions(+), 170 deletions(-) diff --git a/.gitea/workflows/master.yaml b/.gitea/workflows/master.yaml index 990d1b2..33f4f48 100644 --- a/.gitea/workflows/master.yaml +++ b/.gitea/workflows/master.yaml @@ -13,176 +13,184 @@ 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" - php_version: "8.4" - php_short_version: "84" - php_release: "8" - php_major: 'true' - composer_version: "2.8.9" - latest: 'true' + # - 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" + # php_version: "8.4" + # php_short_version: "84" + # php_release: "8" + # php_major: 'true' + # composer_version: "2.8.9" + # latest: 'true' - - os: "micro" - os_version: "8.10" - os_label: "true" - os_short_version: "8" - php_version: "7.2" - php_release: "7" - composer_version: "2.8.9" - - os: "micro" - os_version: "8.10" - os_label: "true" - os_short_version: "8" - php_version: "7.3" - php_release: "7" - composer_version: "2.8.9" - - os: "micro" - os_version: "9.5" - os_label: "true" - os_short_version: "9" - php_version: "7.4" - php_release: "7" - composer_version: "2.8.9" - - os: "micro" - os_version: "9.5" - os_label: "true" - os_short_version: "9" - php_version: "8.0" - php_release: "8" - composer_version: "2.8.9" - - os: "micro" - os_version: "9.5" - os_label: "true" - os_short_version: "9" - php_version: "8.1" - php_release: "8" - composer_version: "2.8.9" - - os: "micro" - os_version: "9.5" - os_label: "true" - os_short_version: "9" - php_version: "8.2" - php_release: "8" - composer_version: "2.8.9" - - os: "micro" - os_version: "9.5" - os_label: "true" - os_short_version: "9" - php_version: "8.3" - php_release: "8" - composer_version: "2.8.9" - - os: "micro" - os_version: "9.5" - os_label: "true" - os_short_version: "9" - php_version: "8.4" - php_release: "8" - php_major: 'true' - composer_version: "2.8.9" - latest: 'true' - - - 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: "micro" + # os_version: "8.10" + # os_label: "true" + # os_short_version: "8" + # php_version: "7.2" + # php_release: "7" + # composer_version: "2.8.9" + # - os: "micro" + # os_version: "8.10" + # os_label: "true" + # os_short_version: "8" + # php_version: "7.3" + # php_release: "7" + # composer_version: "2.8.9" + # - os: "micro" + # os_version: "9.5" + # os_label: "true" + # os_short_version: "9" + # php_version: "7.4" + # php_release: "7" + # composer_version: "2.8.9" + # - os: "micro" + # os_version: "9.5" + # os_label: "true" + # os_short_version: "9" + # php_version: "8.0" + # php_release: "8" + # composer_version: "2.8.9" + # - os: "micro" + # os_version: "9.5" + # os_label: "true" + # os_short_version: "9" + # php_version: "8.1" + # php_release: "8" + # composer_version: "2.8.9" + # - os: "micro" + # os_version: "9.5" + # os_label: "true" + # os_short_version: "9" + # php_version: "8.2" + # php_release: "8" + # composer_version: "2.8.9" + # - os: "micro" + # os_version: "9.5" + # os_label: "true" + # os_short_version: "9" + # php_version: "8.3" + # php_release: "8" + # composer_version: "2.8.9" + # - os: "micro" + # os_version: "9.5" + # os_label: "true" + # os_short_version: "9" + # php_version: "8.4" + # php_release: "8" + # php_major: 'true' + # composer_version: "2.8.9" + # latest: 'true' + + # - 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' + # composer_version: "2.8.9" + # latest: 'true' - 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_version: "8.5" 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' - composer_version: "2.8.9" - latest: 'true' - + php_major: "true" + composer_version: "2.9.2" + latest: "true" + steps: - name: Check out repository code uses: actions/checkout@v4 diff --git a/Dockerfile.micro b/Dockerfile.micro index ebfb2b9..2404db3 100644 --- a/Dockerfile.micro +++ b/Dockerfile.micro @@ -28,7 +28,6 @@ RUN /bin/mkdir -p /mnt/rootfs; \ /bin/dnf -y module reset php; \ /bin/dnf -y module enable php:remi-${PHP_VERSION}; \ /bin/dnf install --installroot /mnt/rootfs \ - coreutils-single \ glibc-minimal-langpack \ php \ php-cli \ @@ -37,14 +36,22 @@ RUN /bin/mkdir -p /mnt/rootfs; \ php-json \ php-mbstring \ php-phar \ - --releasever 9 --setopt install_weak_deps=false --nodocs -y; \ - /bin/dnf --installroot /mnt/rootfs clean all; + --releasever ${OS_SHORT_VERSION} --setopt install_weak_deps=false --nodocs -y; \ + /bin/dnf --installroot /mnt/rootfs clean all; \ + /bin/rm -rf /mnt/rootfs/var/cache/* \ + /mnt/rootfs/var/log/* \ + /mnt/rootfs/var/lib/dnf \ + /mnt/rootfs/usr/share/locale/* \ + /mnt/rootfs/usr/share/licenses/* \ + /mnt/rootfs/usr/share/man/* \ + /mnt/rootfs/usr/share/doc/* \ + /mnt/rootfs/var/log/yum.* \ + /mnt/rootfs/var/lib/rpm/* ; ADD https://github.com/composer/composer/releases/download/${COMPOSER_VERSION}/composer.phar /mnt/rootfs/usr/local/bin/composer # Additional hacks for kickstart file and backward compatable support -RUN /bin/rm -rf /mnt/rootfs/var/cache/dnf /mnt/rootfs/var/log/dnf* /mnt/rootfs/var/lib/dnf /mnt/rootfs/var/log/yum.* /mnt/rootfs/var/lib/rpm/* ; \ - /bin/date +%Y%m%d_%H%M > /mnt/rootfs/etc/BUILDTIME ; \ +RUN /bin/date +%Y%m%d_%H%M > /mnt/rootfs/etc/BUILDTIME ; \ /bin/echo '%_install_langs C.utf8' > /mnt/rootfs/etc/rpm/macros.image-language-conf; \ /bin/echo 'LANG="C.utf8"' > /mnt/rootfs/etc/locale.conf; \ /bin/echo 'container' > /mnt/rootfs/etc/dnf/vars/infra; \