Skip to content

Commit c21f044

Browse files
Ilyes512Ilyes512
authored
Merge pull request #10 from Ilyes512/updates
Updates
2 parents cd4ac4b + d1758e5 commit c21f044

File tree

5 files changed

+38
-14
lines changed

5 files changed

+38
-14
lines changed

‎.github/workflows/main.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ concurrency:
1515

1616
jobs:
1717
build:
18-
uses: Ilyes512/github-actions/.github/workflows/build-php.yml@1.0.2
18+
uses: Ilyes512/github-actions/.github/workflows/build-php.yml@1.0.3
1919
strategy:
2020
fail-fast: false
2121
matrix:
@@ -36,7 +36,7 @@ jobs:
3636
dockerfile: ${{ matrix.docker.dockerfile }}
3737

3838
merge:
39-
uses: Ilyes512/github-actions/.github/workflows/merge-php.yml@1.0.2
39+
uses: Ilyes512/github-actions/.github/workflows/merge-php.yml@1.0.3
4040
needs: build
4141
strategy:
4242
matrix:

‎.github/workflows/pr.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ concurrency:
1414

1515
jobs:
1616
build:
17-
uses: Ilyes512/github-actions/.github/workflows/build-php.yml@1.0.2
17+
uses: Ilyes512/github-actions/.github/workflows/build-php.yml@1.0.3
1818
strategy:
1919
fail-fast: false
2020
matrix:
@@ -35,7 +35,7 @@ jobs:
3535
dockerfile: ${{ matrix.docker.dockerfile }}
3636

3737
merge:
38-
uses: Ilyes512/github-actions/.github/workflows/merge-php.yml@1.0.2
38+
uses: Ilyes512/github-actions/.github/workflows/merge-php.yml@1.0.3
3939
needs: build
4040
strategy:
4141
matrix:

‎.github/workflows/tag.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ concurrency:
1515

1616
jobs:
1717
build:
18-
uses: Ilyes512/github-actions/.github/workflows/build-php.yml@1.0.2
18+
uses: Ilyes512/github-actions/.github/workflows/build-php.yml@1.0.3
1919
strategy:
2020
fail-fast: false
2121
matrix:
@@ -36,7 +36,7 @@ jobs:
3636
dockerfile: ${{ matrix.docker.dockerfile }}
3737

3838
merge:
39-
uses: Ilyes512/github-actions/.github/workflows/merge-php.yml@1.0.2
39+
uses: Ilyes512/github-actions/.github/workflows/merge-php.yml@1.0.3
4040
needs: build
4141
strategy:
4242
matrix:

‎apache/Dockerfile‎

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Latest version of PHP base image: https://hub.docker.com/_/php?tab=tags
2-
FROM php:8.4.4-apache-bookworm AS runtime
2+
FROM php:8.4.5-apache-bookworm AS runtime
33

44
ARG UNIQUE_ID_FOR_CACHEFROM=runtime
55

@@ -8,7 +8,9 @@ ARG PHP_EVENT_VERSION=3.1.4
88
# Latest version of igbinary-extension: https://pecl.php.net/package/igbinary
99
ARG PHP_IGBINARY_VERSION=3.2.16
1010
# Latest version of redis-extension: https://pecl.php.net/package/redis
11-
ARG PHP_REDIS_VERSION=6.1.0
11+
ARG PHP_REDIS_VERSION=6.2.0
12+
# Latest version of memcached-extension: https://pecl.php.net/package/memcached
13+
ARG PHP_MEMCACHED_VERSION=3.3.0
1214
# Latest version of amqp-extension: https://pecl.php.net/package/amqp
1315
ARG PHP_AMQP_VERSION=2.1.2
1416

@@ -43,6 +45,9 @@ RUN apt-get update \
4345
librabbitmq4 \
4446
# Dependency of PHP xsl-extension
4547
libxslt1.1 \
48+
# Dependency of PHP memcached-extension
49+
libmemcached11 \
50+
zlib1g \
4651
# Install packages that are needed for building PHP extensions
4752
&& apt-get install --assume-yes --no-install-recommends \
4853
$PHPIZE_DEPS \
@@ -66,6 +71,9 @@ RUN apt-get update \
6671
librabbitmq-dev \
6772
# Dependency of PHP xsl-extension
6873
libxslt1-dev \
74+
# Dependency of PHP memcached-extension
75+
libmemcached-dev \
76+
zlib1g-dev \
6977
# Configure PHP gd-extension
7078
&& docker-php-ext-configure gd \
7179
--enable-gd \
@@ -90,11 +98,13 @@ RUN apt-get update \
9098
# Optional dependency of PHP redis-extension
9199
&& pecl install "igbinary-$PHP_IGBINARY_VERSION" \
92100
&& pecl install --configureoptions 'enable-redis-igbinary="yes"' "redis-$PHP_REDIS_VERSION" \
101+
&& pecl install --configureoptions 'enable-memcached-igbinary="yes"' "memcached-$PHP_MEMCACHED_VERSION" \
93102
&& pecl install "amqp-$PHP_AMQP_VERSION" \
94103
&& docker-php-ext-enable --ini-name docker-php-ext-zz-custom.ini \
95104
event \
96105
igbinary \
97106
redis \
107+
memcached \
98108
amqp \
99109
&& cp "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini" \
100110
# Purge packages that where only needed for building php extensions
@@ -111,6 +121,8 @@ RUN apt-get update \
111121
libxml2-dev \
112122
libpq-dev \
113123
librabbitmq-dev \
124+
libmemcached-dev \
125+
zlib1g-dev \
114126
# Cleanup
115127
&& rm -rf /var/www/* \
116128
&& apt-get autoremove --assume-yes \
@@ -127,9 +139,9 @@ ARG UNIQUE_ID_FOR_CACHEFROM=builder
127139
# Latest version of Phive: https://api.github.com/repos/phar-io/phive/releases/latest
128140
ARG PHIVE_VERSION=0.15.3
129141
# Latest version of Composer: https://getcomposer.org/download
130-
ARG COMPOSER_VERSION=2.8.5
142+
ARG COMPOSER_VERSION=2.8.6
131143
# Latest version of Xdebug: https://github.com/xdebug/xdebug/tags or https://pecl.php.net/package/xdebug
132-
ARG XDEBUG_VERSION=3.4.1
144+
ARG XDEBUG_VERSION=3.4.2
133145
# Latest version of pcov: https://github.com/krakjoe/pcov/tags or https://pecl.php.net/package/pcov
134146
ARG PCOV_VERSION=1.0.12
135147

‎fpm/Dockerfile‎

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Latest version of PHP base image: https://hub.docker.com/_/php?tab=tags
2-
FROM php:8.4.4-fpm-bookworm AS runtime
2+
FROM php:8.4.5-fpm-bookworm AS runtime
33

44
ARG UNIQUE_ID_FOR_CACHEFROM=runtime
55

@@ -8,7 +8,9 @@ ARG PHP_EVENT_VERSION=3.1.4
88
# Latest version of igbinary-extension: https://pecl.php.net/package/igbinary
99
ARG PHP_IGBINARY_VERSION=3.2.16
1010
# Latest version of redis-extension: https://pecl.php.net/package/redis
11-
ARG PHP_REDIS_VERSION=6.1.0
11+
ARG PHP_REDIS_VERSION=6.2.0
12+
# Latest version of memcached-extension: https://pecl.php.net/package/memcached
13+
ARG PHP_MEMCACHED_VERSION=3.3.0
1214
# Latest version of amqp-extension: https://pecl.php.net/package/amqp
1315
ARG PHP_AMQP_VERSION=2.1.2
1416

@@ -43,6 +45,9 @@ RUN apt-get update \
4345
librabbitmq4 \
4446
# Dependency of PHP xsl-extension
4547
libxslt1.1 \
48+
# Dependency of PHP memcached-extension
49+
libmemcached11 \
50+
zlib1g \
4651
# Install packages that are needed for building PHP extensions
4752
&& apt-get install --assume-yes --no-install-recommends \
4853
$PHPIZE_DEPS \
@@ -66,6 +71,9 @@ RUN apt-get update \
6671
librabbitmq-dev \
6772
# Dependency of PHP xsl-extension
6873
libxslt1-dev \
74+
# Dependency of PHP memcached-extension
75+
libmemcached-dev \
76+
zlib1g-dev \
6977
# Configure PHP gd-extension
7078
&& docker-php-ext-configure gd \
7179
--enable-gd \
@@ -90,11 +98,13 @@ RUN apt-get update \
9098
# Optional dependency of PHP redis-extension
9199
&& pecl install "igbinary-$PHP_IGBINARY_VERSION" \
92100
&& pecl install --configureoptions 'enable-redis-igbinary="yes"' "redis-$PHP_REDIS_VERSION" \
101+
&& pecl install --configureoptions 'enable-memcached-igbinary="yes"' "memcached-$PHP_MEMCACHED_VERSION" \
93102
&& pecl install "amqp-$PHP_AMQP_VERSION" \
94103
&& docker-php-ext-enable --ini-name docker-php-ext-zz-custom.ini \
95104
event \
96105
igbinary \
97106
redis \
107+
memcached \
98108
amqp \
99109
&& cp "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini" \
100110
# Purge packages that where only needed for building php extensions
@@ -111,6 +121,8 @@ RUN apt-get update \
111121
libxml2-dev \
112122
libpq-dev \
113123
librabbitmq-dev \
124+
libmemcached-dev \
125+
zlib1g-dev \
114126
# Cleanup
115127
&& rm -rf /var/www/* \
116128
&& apt-get autoremove --assume-yes \
@@ -127,9 +139,9 @@ ARG UNIQUE_ID_FOR_CACHEFROM=builder
127139
# Latest version of Phive: https://api.github.com/repos/phar-io/phive/releases/latest
128140
ARG PHIVE_VERSION=0.15.3
129141
# Latest version of Composer: https://getcomposer.org/download
130-
ARG COMPOSER_VERSION=2.8.5
142+
ARG COMPOSER_VERSION=2.8.6
131143
# Latest version of Xdebug: https://github.com/xdebug/xdebug/tags or https://pecl.php.net/package/xdebug
132-
ARG XDEBUG_VERSION=3.4.1
144+
ARG XDEBUG_VERSION=3.4.2
133145
# Latest version of pcov: https://github.com/krakjoe/pcov/tags or https://pecl.php.net/package/pcov
134146
ARG PCOV_VERSION=1.0.12
135147

0 commit comments

Comments
 (0)