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.

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

Update wordpress #17551

Merged
merged 1 commit into from
Sep 12, 2024
Merged

Conversation

tianon
Copy link
Member

@tianon tianon commented Sep 12, 2024

Changes:

Changes:

- docker-library/wordpress@aab2a24: Merge pull request docker-library/wordpress#919 from mukeshpanchal27/add/avif-support
- docker-library/wordpress@aa3c30f: Install missing packages for AVIF support
@tianon tianon requested a review from a team as a code owner September 12, 2024 20:02
Copy link

Diff for 4efa414:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index d58d7cd..2d07045 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -3,60 +3,60 @@ GitRepo: https://github.com/docker-library/wordpress.git
 
 Tags: 6.6.2-apache, 6.6-apache, 6-apache, apache, 6.6.2, 6.6, 6, latest, 6.6.2-php8.2-apache, 6.6-php8.2-apache, 6-php8.2-apache, php8.2-apache, 6.6.2-php8.2, 6.6-php8.2, 6-php8.2, php8.2
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 6771e13cc43efa8c9832820c221621bbcca2a00c
+GitCommit: aa3c30f8c0a6a5ba0e1b26f73be802dfc8f18e4f
 Directory: latest/php8.2/apache
 
 Tags: 6.6.2-fpm, 6.6-fpm, 6-fpm, fpm, 6.6.2-php8.2-fpm, 6.6-php8.2-fpm, 6-php8.2-fpm, php8.2-fpm
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 6771e13cc43efa8c9832820c221621bbcca2a00c
+GitCommit: aa3c30f8c0a6a5ba0e1b26f73be802dfc8f18e4f
 Directory: latest/php8.2/fpm
 
 Tags: 6.6.2-fpm-alpine, 6.6-fpm-alpine, 6-fpm-alpine, fpm-alpine, 6.6.2-php8.2-fpm-alpine, 6.6-php8.2-fpm-alpine, 6-php8.2-fpm-alpine, php8.2-fpm-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 6771e13cc43efa8c9832820c221621bbcca2a00c
+GitCommit: aa3c30f8c0a6a5ba0e1b26f73be802dfc8f18e4f
 Directory: latest/php8.2/fpm-alpine
 
 Tags: 6.6.2-php8.1-apache, 6.6-php8.1-apache, 6-php8.1-apache, php8.1-apache, 6.6.2-php8.1, 6.6-php8.1, 6-php8.1, php8.1
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 6771e13cc43efa8c9832820c221621bbcca2a00c
+GitCommit: aa3c30f8c0a6a5ba0e1b26f73be802dfc8f18e4f
 Directory: latest/php8.1/apache
 
 Tags: 6.6.2-php8.1-fpm, 6.6-php8.1-fpm, 6-php8.1-fpm, php8.1-fpm
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 6771e13cc43efa8c9832820c221621bbcca2a00c
+GitCommit: aa3c30f8c0a6a5ba0e1b26f73be802dfc8f18e4f
 Directory: latest/php8.1/fpm
 
 Tags: 6.6.2-php8.1-fpm-alpine, 6.6-php8.1-fpm-alpine, 6-php8.1-fpm-alpine, php8.1-fpm-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 6771e13cc43efa8c9832820c221621bbcca2a00c
+GitCommit: aa3c30f8c0a6a5ba0e1b26f73be802dfc8f18e4f
 Directory: latest/php8.1/fpm-alpine
 
 Tags: 6.6.2-php8.3-apache, 6.6-php8.3-apache, 6-php8.3-apache, php8.3-apache, 6.6.2-php8.3, 6.6-php8.3, 6-php8.3, php8.3
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 6771e13cc43efa8c9832820c221621bbcca2a00c
+GitCommit: aa3c30f8c0a6a5ba0e1b26f73be802dfc8f18e4f
 Directory: latest/php8.3/apache
 
 Tags: 6.6.2-php8.3-fpm, 6.6-php8.3-fpm, 6-php8.3-fpm, php8.3-fpm
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: 6771e13cc43efa8c9832820c221621bbcca2a00c
+GitCommit: aa3c30f8c0a6a5ba0e1b26f73be802dfc8f18e4f
 Directory: latest/php8.3/fpm
 
 Tags: 6.6.2-php8.3-fpm-alpine, 6.6-php8.3-fpm-alpine, 6-php8.3-fpm-alpine, php8.3-fpm-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: 6771e13cc43efa8c9832820c221621bbcca2a00c
+GitCommit: aa3c30f8c0a6a5ba0e1b26f73be802dfc8f18e4f
 Directory: latest/php8.3/fpm-alpine
 
 Tags: cli-2.11.0, cli-2.11, cli-2, cli, cli-2.11.0-php8.2, cli-2.11-php8.2, cli-2-php8.2, cli-php8.2
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: f7e3d05cc365b12c38cdf7c2cfe5584a018bf9de
+GitCommit: aa3c30f8c0a6a5ba0e1b26f73be802dfc8f18e4f
 Directory: cli/php8.2/alpine
 
 Tags: cli-2.11.0-php8.1, cli-2.11-php8.1, cli-2-php8.1, cli-php8.1
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: f7e3d05cc365b12c38cdf7c2cfe5584a018bf9de
+GitCommit: aa3c30f8c0a6a5ba0e1b26f73be802dfc8f18e4f
 Directory: cli/php8.1/alpine
 
 Tags: cli-2.11.0-php8.3, cli-2.11-php8.3, cli-2-php8.3, cli-php8.3
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: f7e3d05cc365b12c38cdf7c2cfe5584a018bf9de
+GitCommit: aa3c30f8c0a6a5ba0e1b26f73be802dfc8f18e4f
 Directory: cli/php8.3/alpine
diff --git a/wordpress_cli-php8.1/Dockerfile b/wordpress_cli-php8.1/Dockerfile
index 6b85697..ee49be3 100644
--- a/wordpress_cli-php8.1/Dockerfile
+++ b/wordpress_cli-php8.1/Dockerfile
@@ -25,7 +25,8 @@ RUN set -ex; \
 		$PHPIZE_DEPS \
 		freetype-dev \
 		icu-dev \
-		imagemagick-dev \
+		imagemagick-dev libheif-dev \
+		libavif-dev \
 		libjpeg-turbo-dev \
 		libpng-dev \
 		libwebp-dev \
@@ -33,6 +34,7 @@ RUN set -ex; \
 	; \
 	\
 	docker-php-ext-configure gd \
+		--with-avif \
 		--with-freetype \
 		--with-jpeg \
 		--with-webp \
diff --git a/wordpress_cli-php8.2/Dockerfile b/wordpress_cli-php8.2/Dockerfile
index a02e5f9..1bd85cf 100644
--- a/wordpress_cli-php8.2/Dockerfile
+++ b/wordpress_cli-php8.2/Dockerfile
@@ -25,7 +25,8 @@ RUN set -ex; \
 		$PHPIZE_DEPS \
 		freetype-dev \
 		icu-dev \
-		imagemagick-dev \
+		imagemagick-dev libheif-dev \
+		libavif-dev \
 		libjpeg-turbo-dev \
 		libpng-dev \
 		libwebp-dev \
@@ -33,6 +34,7 @@ RUN set -ex; \
 	; \
 	\
 	docker-php-ext-configure gd \
+		--with-avif \
 		--with-freetype \
 		--with-jpeg \
 		--with-webp \
diff --git a/wordpress_cli-php8.3/Dockerfile b/wordpress_cli-php8.3/Dockerfile
index e9e7d30..d5df8ea 100644
--- a/wordpress_cli-php8.3/Dockerfile
+++ b/wordpress_cli-php8.3/Dockerfile
@@ -25,7 +25,8 @@ RUN set -ex; \
 		$PHPIZE_DEPS \
 		freetype-dev \
 		icu-dev \
-		imagemagick-dev \
+		imagemagick-dev libheif-dev \
+		libavif-dev \
 		libjpeg-turbo-dev \
 		libpng-dev \
 		libwebp-dev \
@@ -33,6 +34,7 @@ RUN set -ex; \
 	; \
 	\
 	docker-php-ext-configure gd \
+		--with-avif \
 		--with-freetype \
 		--with-jpeg \
 		--with-webp \
diff --git a/wordpress_php8.1-fpm-alpine/Dockerfile b/wordpress_php8.1-fpm-alpine/Dockerfile
index 9910492..12d523b 100644
--- a/wordpress_php8.1-fpm-alpine/Dockerfile
+++ b/wordpress_php8.1-fpm-alpine/Dockerfile
@@ -24,7 +24,8 @@ RUN set -ex; \
 		$PHPIZE_DEPS \
 		freetype-dev \
 		icu-dev \
-		imagemagick-dev \
+		imagemagick-dev libheif-dev \
+		libavif-dev \
 		libjpeg-turbo-dev \
 		libpng-dev \
 		libwebp-dev \
@@ -32,6 +33,7 @@ RUN set -ex; \
 	; \
 	\
 	docker-php-ext-configure gd \
+		--with-avif \
 		--with-freetype \
 		--with-jpeg \
 		--with-webp \
diff --git a/wordpress_php8.1-fpm/Dockerfile b/wordpress_php8.1-fpm/Dockerfile
index d45d438..03d44e4 100644
--- a/wordpress_php8.1-fpm/Dockerfile
+++ b/wordpress_php8.1-fpm/Dockerfile
@@ -22,6 +22,7 @@ RUN set -ex; \
 	\
 	apt-get update; \
 	apt-get install -y --no-install-recommends \
+		libavif-dev \
 		libfreetype6-dev \
 		libicu-dev \
 		libjpeg-dev \
@@ -32,6 +33,7 @@ RUN set -ex; \
 	; \
 	\
 	docker-php-ext-configure gd \
+		--with-avif \
 		--with-freetype \
 		--with-jpeg \
 		--with-webp \
diff --git a/wordpress_php8.1/Dockerfile b/wordpress_php8.1/Dockerfile
index 542017d..eb513e4 100644
--- a/wordpress_php8.1/Dockerfile
+++ b/wordpress_php8.1/Dockerfile
@@ -22,6 +22,7 @@ RUN set -ex; \
 	\
 	apt-get update; \
 	apt-get install -y --no-install-recommends \
+		libavif-dev \
 		libfreetype6-dev \
 		libicu-dev \
 		libjpeg-dev \
@@ -32,6 +33,7 @@ RUN set -ex; \
 	; \
 	\
 	docker-php-ext-configure gd \
+		--with-avif \
 		--with-freetype \
 		--with-jpeg \
 		--with-webp \
diff --git a/wordpress_php8.2-fpm-alpine/Dockerfile b/wordpress_php8.2-fpm-alpine/Dockerfile
index bf9e535..9e8c409 100644
--- a/wordpress_php8.2-fpm-alpine/Dockerfile
+++ b/wordpress_php8.2-fpm-alpine/Dockerfile
@@ -24,7 +24,8 @@ RUN set -ex; \
 		$PHPIZE_DEPS \
 		freetype-dev \
 		icu-dev \
-		imagemagick-dev \
+		imagemagick-dev libheif-dev \
+		libavif-dev \
 		libjpeg-turbo-dev \
 		libpng-dev \
 		libwebp-dev \
@@ -32,6 +33,7 @@ RUN set -ex; \
 	; \
 	\
 	docker-php-ext-configure gd \
+		--with-avif \
 		--with-freetype \
 		--with-jpeg \
 		--with-webp \
diff --git a/wordpress_php8.2-fpm/Dockerfile b/wordpress_php8.2-fpm/Dockerfile
index a0e0d6b..f3a9d06 100644
--- a/wordpress_php8.2-fpm/Dockerfile
+++ b/wordpress_php8.2-fpm/Dockerfile
@@ -22,6 +22,7 @@ RUN set -ex; \
 	\
 	apt-get update; \
 	apt-get install -y --no-install-recommends \
+		libavif-dev \
 		libfreetype6-dev \
 		libicu-dev \
 		libjpeg-dev \
@@ -32,6 +33,7 @@ RUN set -ex; \
 	; \
 	\
 	docker-php-ext-configure gd \
+		--with-avif \
 		--with-freetype \
 		--with-jpeg \
 		--with-webp \
diff --git a/wordpress_php8.2/Dockerfile b/wordpress_php8.2/Dockerfile
index 12bf93d..a67efd7 100644
--- a/wordpress_php8.2/Dockerfile
+++ b/wordpress_php8.2/Dockerfile
@@ -22,6 +22,7 @@ RUN set -ex; \
 	\
 	apt-get update; \
 	apt-get install -y --no-install-recommends \
+		libavif-dev \
 		libfreetype6-dev \
 		libicu-dev \
 		libjpeg-dev \
@@ -32,6 +33,7 @@ RUN set -ex; \
 	; \
 	\
 	docker-php-ext-configure gd \
+		--with-avif \
 		--with-freetype \
 		--with-jpeg \
 		--with-webp \
diff --git a/wordpress_php8.3-fpm-alpine/Dockerfile b/wordpress_php8.3-fpm-alpine/Dockerfile
index 10c6a1b..04ba455 100644
--- a/wordpress_php8.3-fpm-alpine/Dockerfile
+++ b/wordpress_php8.3-fpm-alpine/Dockerfile
@@ -24,7 +24,8 @@ RUN set -ex; \
 		$PHPIZE_DEPS \
 		freetype-dev \
 		icu-dev \
-		imagemagick-dev \
+		imagemagick-dev libheif-dev \
+		libavif-dev \
 		libjpeg-turbo-dev \
 		libpng-dev \
 		libwebp-dev \
@@ -32,6 +33,7 @@ RUN set -ex; \
 	; \
 	\
 	docker-php-ext-configure gd \
+		--with-avif \
 		--with-freetype \
 		--with-jpeg \
 		--with-webp \
diff --git a/wordpress_php8.3-fpm/Dockerfile b/wordpress_php8.3-fpm/Dockerfile
index 05d32c6..df8fa2b 100644
--- a/wordpress_php8.3-fpm/Dockerfile
+++ b/wordpress_php8.3-fpm/Dockerfile
@@ -22,6 +22,7 @@ RUN set -ex; \
 	\
 	apt-get update; \
 	apt-get install -y --no-install-recommends \
+		libavif-dev \
 		libfreetype6-dev \
 		libicu-dev \
 		libjpeg-dev \
@@ -32,6 +33,7 @@ RUN set -ex; \
 	; \
 	\
 	docker-php-ext-configure gd \
+		--with-avif \
 		--with-freetype \
 		--with-jpeg \
 		--with-webp \
diff --git a/wordpress_php8.3/Dockerfile b/wordpress_php8.3/Dockerfile
index b42f9a0..aa2c758 100644
--- a/wordpress_php8.3/Dockerfile
+++ b/wordpress_php8.3/Dockerfile
@@ -22,6 +22,7 @@ RUN set -ex; \
 	\
 	apt-get update; \
 	apt-get install -y --no-install-recommends \
+		libavif-dev \
 		libfreetype6-dev \
 		libicu-dev \
 		libjpeg-dev \
@@ -32,6 +33,7 @@ RUN set -ex; \
 	; \
 	\
 	docker-php-ext-configure gd \
+		--with-avif \
 		--with-freetype \
 		--with-jpeg \
 		--with-webp \

Relevant Maintainers:

@yosifkit yosifkit merged commit f6ed71c into docker-library:master Sep 12, 2024
17 checks passed
@yosifkit yosifkit deleted the wordpress branch September 12, 2024 21:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants