Merge PHP_EXTRA_* into the places they're used

Also, this explicitly treats "cli" and "zts" variants as similar for the purposes of `--enable-embed`.
docker-library · Oct 9, 2021 · 6d7ea20 · 6d7ea20
1 parent 104c2a7
commit 6d7ea20
Show file tree

Hide file tree

Showing 54 changed files with 216 additions and 220 deletions.
diff --git a/7.3/alpine3.13/cli/Dockerfile b/7.3/alpine3.13/cli/Dockerfile
diff --git a/7.3/alpine3.13/fpm/Dockerfile b/7.3/alpine3.13/fpm/Dockerfile
diff --git a/7.3/alpine3.13/zts/Dockerfile b/7.3/alpine3.13/zts/Dockerfile
diff --git a/7.3/alpine3.14/cli/Dockerfile b/7.3/alpine3.14/cli/Dockerfile
diff --git a/7.3/alpine3.14/fpm/Dockerfile b/7.3/alpine3.14/fpm/Dockerfile
diff --git a/7.3/alpine3.14/zts/Dockerfile b/7.3/alpine3.14/zts/Dockerfile
diff --git a/7.3/bullseye/apache/Dockerfile b/7.3/bullseye/apache/Dockerfile
diff --git a/7.3/bullseye/cli/Dockerfile b/7.3/bullseye/cli/Dockerfile
diff --git a/7.3/bullseye/fpm/Dockerfile b/7.3/bullseye/fpm/Dockerfile
diff --git a/7.3/bullseye/zts/Dockerfile b/7.3/bullseye/zts/Dockerfile
diff --git a/7.3/buster/apache/Dockerfile b/7.3/buster/apache/Dockerfile
diff --git a/7.3/buster/cli/Dockerfile b/7.3/buster/cli/Dockerfile
diff --git a/7.3/buster/fpm/Dockerfile b/7.3/buster/fpm/Dockerfile
diff --git a/7.3/buster/zts/Dockerfile b/7.3/buster/zts/Dockerfile
diff --git a/7.4/alpine3.13/cli/Dockerfile b/7.4/alpine3.13/cli/Dockerfile
diff --git a/7.4/alpine3.13/fpm/Dockerfile b/7.4/alpine3.13/fpm/Dockerfile
diff --git a/7.4/alpine3.13/zts/Dockerfile b/7.4/alpine3.13/zts/Dockerfile
diff --git a/7.4/alpine3.14/cli/Dockerfile b/7.4/alpine3.14/cli/Dockerfile