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

Merge PHP_EXTRA_* into the places they're used #1208

Merged
merged 1 commit into from
Oct 11, 2021

Conversation

tianon
Copy link
Member

@tianon tianon commented Oct 9, 2021

Also, this explicitly treats "cli" and "zts" variants as similar for the purposes of --enable-embed.

This is a continuation / follow-up for #1193.

Closes #1175

Also, this explicitly treats "cli" and "zts" variants as similar for the purposes of `--enable-embed`.
\
--disable-cgi \
{{ ) end -}}
{{ if (env.variant == "cli" or env.variant == "zts") and (is_alpine | not) then ( -}}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
{{ if (env.variant == "cli" or env.variant == "zts") and (is_alpine | not) then ( -}}
{{ if (env.variant == "cli" or env.variant == "zts") then ( -}}

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm less convinced there -- it's a ~14MB increase. On the Debian-based images, we're on the order of almost 500MB already, so another 14 is pretty negligible in comparison. On Alpine, we're currently at ~84MB, so this would be a pretty noticeable increase in overall image size.

@yosifkit yosifkit merged commit 1e6fd3b into docker-library:master Oct 11, 2021
@yosifkit yosifkit deleted the extra-extra branch October 11, 2021 22:44
docker-library-bot added a commit to docker-library-bot/official-images that referenced this pull request Oct 12, 2021
Changes:

- docker-library/php@1e6fd3b: Merge pull request docker-library/php#1208 from infosiftr/extra-extra
- docker-library/php@6d7ea20: Merge PHP_EXTRA_* into the places they're used
docker-library-bot added a commit to docker-library-bot/official-images that referenced this pull request Oct 13, 2021
Changes:

- docker-library/php@15ddd64: Merge pull request docker-library/php#1213 from infosiftr/strip-ext
- docker-library/php@d7f4627: Merge pull request docker-library/php#1212 from infosiftr/find-perm
- docker-library/php@b2c6b85: Add stripping to installed extensions
- docker-library/php@6e558df: Fix "find -perm" syntax (and ignore "strip" failures but not "find" failures)
- docker-library/php@1e6fd3b: Merge pull request docker-library/php#1208 from infosiftr/extra-extra
- docker-library/php@6d7ea20: Merge PHP_EXTRA_* into the places they're used
docker-library-bot added a commit to docker-library-bot/official-images that referenced this pull request Oct 14, 2021
Changes:

- docker-library/php@505d866: Update 8.1-rc to 8.1.0RC4
- docker-library/php@15ddd64: Merge pull request docker-library/php#1213 from infosiftr/strip-ext
- docker-library/php@d7f4627: Merge pull request docker-library/php#1212 from infosiftr/find-perm
- docker-library/php@b2c6b85: Add stripping to installed extensions
- docker-library/php@6e558df: Fix "find -perm" syntax (and ignore "strip" failures but not "find" failures)
- docker-library/php@1e6fd3b: Merge pull request docker-library/php#1208 from infosiftr/extra-extra
- docker-library/php@6d7ea20: Merge PHP_EXTRA_* into the places they're used
NeilHanlon pushed a commit to NeilHanlon/official-images that referenced this pull request Oct 27, 2021
Changes:

- docker-library/php@505d866: Update 8.1-rc to 8.1.0RC4
- docker-library/php@15ddd64: Merge pull request docker-library/php#1213 from infosiftr/strip-ext
- docker-library/php@d7f4627: Merge pull request docker-library/php#1212 from infosiftr/find-perm
- docker-library/php@b2c6b85: Add stripping to installed extensions
- docker-library/php@6e558df: Fix "find -perm" syntax (and ignore "strip" failures but not "find" failures)
- docker-library/php@1e6fd3b: Merge pull request docker-library/php#1208 from infosiftr/extra-extra
- docker-library/php@6d7ea20: Merge PHP_EXTRA_* into the places they're used
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants