Swap CFLAGS to PHP_CLFAGS#352
Merged
tianon merged 2 commits intodocker-library:masterfrom Dec 13, 2016
Merged
Conversation
Member
Author
$ # current image with CFLAGS
$ docker run -it --rm php bash
root@71ff088724ee:/# file /usr/local/bin/php
/usr/local/bin/php: ELF 64-bit LSB executable, x86-64, version 1 (SYSV), dynamically linked, interpreter /lib64/ld-linux-x86-64.so.2, for GNU/Linux 2.6.32, BuildID[sha1]=e3bf2c45a8b2f7730413025d0f9e169f3ef4edc6, stripped
$ # new image with PHP_CFLAGS and -pie
$ docker run -it --rm f86d7463f704 bash
root@b2fc4abd737e:/# file /usr/local/bin/php
/usr/local/bin/php: ELF 64-bit LSB shared object, x86-64, version 1 (SYSV), dynamically linked, interpreter /lib64/ld-linux-x86-64.so.2, for GNU/Linux 2.6.32, BuildID[sha1]=697bc32f0d98b1bd49a40a43102a20256163d434, stripped |
tianon
added a commit
to infosiftr/stackbrew
that referenced
this pull request
Dec 13, 2016
- `celery`: 4.0.1 - `docker`: 1.12.4 - `elasticsearch`: add Alpine variants (docker-library/elasticsearch#149) - `ghost`: allow arbitrary `--user` values (docker-library/ghost#54) - `haproxy`: 1.7.1 - `java`: debian 9~b148-1 - `mariadb`: add explicit `--socket` (MariaDB/mariadb-docker#92) - `mysql`: 5.7.17-1debian8, 5.6.35-1debian8, 5.5.54 - `openjdk`: debian 9~b148-1 - `percona`: add explicit `--socket` (docker-library/percona#37) - `php`: move `CFLAGS` (and friends) to `PHP_CFLAGS`, add `-pie` (docker-library/php#352) - `postgres`: 9.6.1-2.pgdg80+1, use `pgsql -f ...` instead of `pgsql < ...` for relative includes (docker-library/postgres#234) - `rocket.chat`: 0.48.1 - `tomcat`: 8.5.9, 9.0.0.M15 - `wordpress`: add `fpm-alpine` variant (docker-library/wordpress#190)
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Closes #351; Fixes #347.
This will ensure we don't break other downstream builds and lets us use the flags for the php build and any of the contained php modules that can be built with the
docker-php-ext=*scripts. When usingdocker-php-ext-*scripts, if a user suppliesCLFAGS,CPPFLAGS, orLDFLAGSin their environment it will not be overridden by the respectivePHP_variable.Also add
-pieso that the linker knows too. (see #351 (comment))First commit updates just the templates; second commit is
update.sh.