Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add php 8.4 #8

Merged
merged 4 commits into from
Jan 19, 2025
Merged

Add php 8.4 #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e105ab7
Add php 8.4
mpysiak Jan 8, 2025
ad48cce
fix build
mpysiak Jan 8, 2025
9eeb261
Bump APCU_VERSION to version 5.1.24 to allow successful build for PHP…
piotrkardasz Jan 19, 2025
76d49e6
Fix Bazel tests
piotrkardasz Jan 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .github/workflows/hadolint.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,5 @@ jobs:
- uses: hadolint/[email protected]
with:
dockerfile: Dockerfile
failure-threshold: warning
failure-threshold: error
recursive: true
6 changes: 3 additions & 3 deletions .github/workflows/sylius-php.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
strategy:
fail-fast: false
matrix:
php: [ "7.3", "7.4", "8.0", "8.1", "8.2", "8.3" ]
php: [ "7.3", "7.4", "8.0", "8.1", "8.2", "8.3", "8.4" ]
distro: [ "alpine" ]

steps:
Expand Down Expand Up @@ -164,7 +164,7 @@ jobs:
strategy:
fail-fast: false
matrix:
php: [ "7.3", "7.4", "8.0", "8.1", "8.2", "8.3" ]
php: [ "7.3", "7.4", "8.0", "8.1", "8.2", "8.3", "8.4" ]
distro: [ "alpine" ]

steps:
Expand Down Expand Up @@ -250,7 +250,7 @@ jobs:
strategy:
fail-fast: false
matrix:
php: [ "7.3", "7.4", "8.0", "8.1", "8.2", "8.3" ]
php: [ "7.3", "7.4", "8.0", "8.1", "8.2", "8.3", "8.4" ]
version: [ "alpine", "xdebug-alpine" ]

steps:
Expand Down
3 changes: 1 addition & 2 deletions WORKSPACE
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
workspace(name = "sylius-php")

load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_file")
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive", "http_file")

http_archive(
name = "io_bazel_rules_docker",
Expand Down
6 changes: 3 additions & 3 deletions php/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package(default_visibility = ["//visibility:public"])

load("@io_bazel_rules_docker//contrib:test.bzl", "container_test")
load("@io_bazel_rules_docker//container:import.bzl", "container_import")
load("@io_bazel_rules_docker//contrib:test.bzl", "container_test")
load(":php-arch.bzl", "ARCHITECTURES")
load(":php-version.bzl", "PHP_VERSION")

package(default_visibility = ["//visibility:public"])

[
container_test(
name = "php" + PHP_VERSION + "_" + arch + "_test",
Expand Down
2 changes: 1 addition & 1 deletion php/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ARG PHP_SHORT_VERSION=7.4
ARG APCU_VERSION=5.1.21
ARG APCU_VERSION=5.1.24

FROM php:${PHP_SHORT_VERSION}-fpm-alpine

Expand All @@ -7,7 +7,7 @@
ARG APCU_VERSION

# persistent / runtime deps
RUN apk add --no-cache \

Check failure on line 10 in php/Dockerfile

View workflow job for this annotation

GitHub Actions / Dockerfile check 

DL3018 warning: Pin versions in apk add. Instead of `apk add <package>` use `apk add <package>=<version>`
acl \
file \
gettext \
Expand All @@ -19,7 +19,7 @@
ENV LD_PRELOAD /usr/lib/preloadable_libiconv.so


RUN set -eux; \

Check failure on line 22 in php/Dockerfile

View workflow job for this annotation

GitHub Actions / Dockerfile check 

DL3018 warning: Pin versions in apk add. Instead of `apk add <package>` use `apk add <package>=<version>`

Check failure on line 22 in php/Dockerfile

View workflow job for this annotation

GitHub Actions / Dockerfile check 

SC2086 info: Double quote to prevent globbing and word splitting.

Check failure on line 22 in php/Dockerfile

View workflow job for this annotation

GitHub Actions / Dockerfile check 

DL4006 warning: Set the SHELL option -o pipefail before RUN with a pipe in it. If you are using /bin/sh in an alpine image or if your shell is symlinked to busybox then consider explicitly setting your SHELL to /bin/ash, or disable this check
apk add --no-cache --virtual .build-deps \
$PHPIZE_DEPS \
freetype-dev \
Expand Down
4 changes: 2 additions & 2 deletions php/testdata/php8.1_amd64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ fileExistenceTests:
path: '/usr/bin/composer'
shouldExist: true
permissions: '-rwxr-xr-x'
- name: 'PHP Entry point 775'
- name: 'PHP Entry point 755'
path: '/usr/local/bin/docker-php-entrypoint'
shouldExist: true
permissions: '-rwxrwxr-x'
permissions: '-rwxr-xr-x'
commandTests:
- name: arch
command: [ "uname", "-m" ]
Expand Down
4 changes: 2 additions & 2 deletions php/testdata/php8.1_arm64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ fileExistenceTests:
path: '/usr/bin/composer'
shouldExist: true
permissions: '-rwxr-xr-x'
- name: 'PHP Entry point 775'
- name: 'PHP Entry point 755'
path: '/usr/local/bin/docker-php-entrypoint'
shouldExist: true
permissions: '-rwxrwxr-x'
permissions: '-rwxr-xr-x'
commandTests:
- name: arch
command: [ "uname", "-m" ]
Expand Down
4 changes: 2 additions & 2 deletions php/testdata/php8.2_amd64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ fileExistenceTests:
path: '/usr/bin/composer'
shouldExist: true
permissions: '-rwxr-xr-x'
- name: 'PHP Entry point 775'
- name: 'PHP Entry point 755'
path: '/usr/local/bin/docker-php-entrypoint'
shouldExist: true
permissions: '-rwxrwxr-x'
permissions: '-rwxr-xr-x'
commandTests:
- name: arch
command: [ "uname", "-m" ]
Expand Down
4 changes: 2 additions & 2 deletions php/testdata/php8.2_arm64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ fileExistenceTests:
path: '/usr/bin/composer'
shouldExist: true
permissions: '-rwxr-xr-x'
- name: 'PHP Entry point 775'
- name: 'PHP Entry point 755'
path: '/usr/local/bin/docker-php-entrypoint'
shouldExist: true
permissions: '-rwxrwxr-x'
permissions: '-rwxr-xr-x'
commandTests:
- name: arch
command: [ "uname", "-m" ]
Expand Down
4 changes: 2 additions & 2 deletions php/testdata/php8.3_amd64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ fileExistenceTests:
path: '/usr/bin/composer'
shouldExist: true
permissions: '-rwxr-xr-x'
- name: 'PHP Entry point 775'
- name: 'PHP Entry point 755'
path: '/usr/local/bin/docker-php-entrypoint'
shouldExist: true
permissions: '-rwxrwxr-x'
permissions: '-rwxr-xr-x'
commandTests:
- name: arch
command: [ "uname", "-m" ]
Expand Down
4 changes: 2 additions & 2 deletions php/testdata/php8.3_arm64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ fileExistenceTests:
path: '/usr/bin/composer'
shouldExist: true
permissions: '-rwxr-xr-x'
- name: 'PHP Entry point 775'
- name: 'PHP Entry point 755'
path: '/usr/local/bin/docker-php-entrypoint'
shouldExist: true
permissions: '-rwxrwxr-x'
permissions: '-rwxr-xr-x'
commandTests:
- name: arch
command: [ "uname", "-m" ]
Expand Down
118 changes: 118 additions & 0 deletions php/testdata/php8.4_amd64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,118 @@
schemaVersion: "1.0.0"
fileExistenceTests:
- name: php-fpm executable
path: '/usr/local/sbin/php-fpm'
shouldExist: true
- name: php executable
path: '/usr/local/bin/php'
shouldExist: true
- name: 'Composer 755'
path: '/usr/bin/composer'
shouldExist: true
permissions: '-rwxr-xr-x'
- name: 'PHP Entry point 755'
path: '/usr/local/bin/docker-php-entrypoint'
shouldExist: true
permissions: '-rwxr-xr-x'
commandTests:
- name: arch
command: [ "uname", "-m" ]
expectedOutput: [ "x86_64" ]
- name: php-fpm version
command: [ "/usr/local/sbin/php-fpm", "--version" ]
expectedOutput: [ "PHP 8.4" ]
- name: php-fpm-modules
command: [ "/usr/local/sbin/php-fpm", "-m" ]
expectedOutput:
- 'apcu'
- 'cgi-fcgi'
- 'Core'
- 'ctype'
- 'curl'
- 'date'
- 'dom'
- 'exif'
- 'fileinfo'
- 'filter'
- 'gd'
- 'hash'
- 'iconv'
- 'intl'
- 'json'
- 'libxml'
- 'mbstring'
- 'mysqlnd'
- 'openssl'
- 'pcre'
- 'PDO'
- 'pdo_mysql'
- 'Phar'
- 'posix'
- 'readline'
- 'Reflection'
- 'session'
- 'SimpleXML'
- 'sodium'
- 'SPL'
- 'standard'
- 'tokenizer'
- 'xml'
- 'xmlreader'
- 'xmlwriter'
- 'Zend OPcache'
- 'zip'
- 'zlib'
- name: php-cli version
command: [ "/usr/local/bin/php", "--version" ]
expectedOutput: [ "PHP 8.4" ]
- name: config-files
command: [ "/usr/local/bin/php", "--ini" ]
expectedOutput:
- '/usr/local/etc/php/conf.d/docker-php-ext-apcu.ini'
- '/usr/local/etc/php/conf.d/docker-php-ext-exif.ini'
- '/usr/local/etc/php/conf.d/docker-php-ext-gd.ini'
- '/usr/local/etc/php/conf.d/docker-php-ext-intl.ini'
- '/usr/local/etc/php/conf.d/docker-php-ext-opcache.ini'
- '/usr/local/etc/php/conf.d/docker-php-ext-pdo_mysql.ini'
- '/usr/local/etc/php/conf.d/docker-php-ext-sodium.ini'
- '/usr/local/etc/php/conf.d/docker-php-ext-zip.ini'
- name: php-cli extensions
command: [ "/usr/local/bin/php", "-m" ]
expectedOutput:
- 'apcu'
- 'Core'
- 'ctype'
- 'curl'
- 'date'
- 'dom'
- 'exif'
- 'fileinfo'
- 'filter'
- 'gd'
- 'hash'
- 'iconv'
- 'intl'
- 'json'
- 'libxml'
- 'mbstring'
- 'mysqlnd'
- 'openssl'
- 'pcre'
- 'PDO'
- 'pdo_mysql'
- 'Phar'
- 'posix'
- 'readline'
- 'Reflection'
- 'session'
- 'SimpleXML'
- 'sodium'
- 'SPL'
- 'standard'
- 'tokenizer'
- 'xml'
- 'xmlreader'
- 'xmlwriter'
- 'Zend OPcache'
- 'zip'
- 'zlib'
118 changes: 118 additions & 0 deletions php/testdata/php8.4_arm64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,118 @@
schemaVersion: "1.0.0"
fileExistenceTests:
- name: php-fpm executable
path: '/usr/local/sbin/php-fpm'
shouldExist: true
- name: php executable
path: '/usr/local/bin/php'
shouldExist: true
- name: 'Composer 755'
path: '/usr/bin/composer'
shouldExist: true
permissions: '-rwxr-xr-x'
- name: 'PHP Entry point 755'
path: '/usr/local/bin/docker-php-entrypoint'
shouldExist: true
permissions: '-rwxr-xr-x'
commandTests:
- name: arch
command: [ "uname", "-m" ]
expectedOutput: [ "aarch64" ]
- name: php-fpm version
command: [ "/usr/local/sbin/php-fpm", "--version" ]
expectedOutput: [ "PHP 8.4" ]
- name: php-fpm-modules
command: [ "/usr/local/sbin/php-fpm", "-m" ]
expectedOutput:
- 'apcu'
- 'cgi-fcgi'
- 'Core'
- 'ctype'
- 'curl'
- 'date'
- 'dom'
- 'exif'
- 'fileinfo'
- 'filter'
- 'gd'
- 'hash'
- 'iconv'
- 'intl'
- 'json'
- 'libxml'
- 'mbstring'
- 'mysqlnd'
- 'openssl'
- 'pcre'
- 'PDO'
- 'pdo_mysql'
- 'Phar'
- 'posix'
- 'readline'
- 'Reflection'
- 'session'
- 'SimpleXML'
- 'sodium'
- 'SPL'
- 'standard'
- 'tokenizer'
- 'xml'
- 'xmlreader'
- 'xmlwriter'
- 'Zend OPcache'
- 'zip'
- 'zlib'
- name: php-cli version
command: [ "/usr/local/bin/php", "--version" ]
expectedOutput: [ "PHP 8.4" ]
- name: config-files
command: [ "/usr/local/bin/php", "--ini" ]
expectedOutput:
- '/usr/local/etc/php/conf.d/docker-php-ext-apcu.ini'
- '/usr/local/etc/php/conf.d/docker-php-ext-exif.ini'
- '/usr/local/etc/php/conf.d/docker-php-ext-gd.ini'
- '/usr/local/etc/php/conf.d/docker-php-ext-intl.ini'
- '/usr/local/etc/php/conf.d/docker-php-ext-opcache.ini'
- '/usr/local/etc/php/conf.d/docker-php-ext-pdo_mysql.ini'
- '/usr/local/etc/php/conf.d/docker-php-ext-sodium.ini'
- '/usr/local/etc/php/conf.d/docker-php-ext-zip.ini'
- name: php-cli extensions
command: [ "/usr/local/bin/php", "-m" ]
expectedOutput:
- 'apcu'
- 'Core'
- 'ctype'
- 'curl'
- 'date'
- 'dom'
- 'exif'
- 'fileinfo'
- 'filter'
- 'gd'
- 'hash'
- 'iconv'
- 'intl'
- 'json'
- 'libxml'
- 'mbstring'
- 'mysqlnd'
- 'openssl'
- 'pcre'
- 'PDO'
- 'pdo_mysql'
- 'Phar'
- 'posix'
- 'readline'
- 'Reflection'
- 'session'
- 'SimpleXML'
- 'sodium'
- 'SPL'
- 'standard'
- 'tokenizer'
- 'xml'
- 'xmlreader'
- 'xmlwriter'
- 'Zend OPcache'
- 'zip'
- 'zlib'
Loading