Commit Graph

55 Commits

Author SHA1 Message Date
Joe Ferguson
7eb1b847f1 Update s390x test to the proper dpkg-architecture value
+ dpkg-architecture --query DEB_BUILD_GNU_TYPE
+ gnuArch=s390x-linux-musl
+ test s390x-linux-musl '=' s390x-linux-gnu
2019-07-25 16:06:53 -07:00
Tianon Gravi
e2331f5270 Add "--with-pear" in 7.4
This means that `pear` and `pecl` will be available for PHP 7.4+, but *will be removed* in PHP 8+ (see https://externals.io/message/103977 for upstream discussion around this deprecation).

I tested the 8+ changes to this script by creating a few fake "8.0" bits in the script itself (fake `possibles` version, etc) and verified that the result is as expected.
2019-06-26 02:29:25 -07:00
Peter Kokot
894ee591c5 Remove the Alpine argon2 library fix
The fix has been patched upstream in Alpine and upcoming
PHP 7.4.0alpha2.
2019-06-25 15:04:07 -07:00
Tianon Gravi
250c2d872d Add "set -u" and more consistency 2019-06-24 14:55:17 -07:00
J0WI
82d590a8c7 Use already available curl and consistent code style 2019-06-24 12:55:09 -07:00
Joe Ferguson
d92a953b08 Fix build issues on 7.4.0-alpha1 2019-06-14 14:02:52 -07:00
Tianon Gravi
a1ebdc9851 Remove "--virtual" where it's not providing value (and use "apk del --no-network" consistently) 2019-03-04 16:41:05 -08:00
Joe Ferguson
640a30e8ff Apply 'remove extensions/*.a' to templates and run update.sh 2019-02-14 16:30:31 -08:00
J0WI
90beb19f38 Add Alpine 3.9 variant 2019-02-01 13:37:56 -08:00
Tianon Gravi
ea377551f7 Adjust "/var/www/html" permissions consistently across variants
The issue speaks for itself:

```console
$ docker run --rm php:apache ls -ld /var/www/html
drwxrwxrwx 2 www-data www-data 4096 Jan 22 21:56 /var/www/html

$ docker run --rm php:fpm ls -ld /var/www/html
drwxr-xr-x 2 root root 4096 Jan 22 22:10 /var/www/html
```
2019-01-31 14:45:15 -08:00
Tianon Gravi
b99209cc07 Update "gpg" invocations to use "--batch"
See https://bugs.debian.org/913614
2018-11-14 12:44:19 -08:00
Tianon Gravi
88189f0168 Ship PHP's example "php.ini-production" and "php.ini-development" files in "$PHP_INI_DIR" 2018-08-27 15:26:42 -07:00
Tianon Gravi
c53a180b78 Swap from "sid" to "buster" and slightly adjust the implementation to match the templating 2018-08-10 14:32:01 -07:00
Tim Düsterhus
edf4f2f316
Enable argon2 for alpine 3.8+ 2018-08-01 14:10:41 +02:00
Tianon Gravi
b250a22ce6 Add "pgp-happy-eyeballs" in Travis to help cut down on gpg-related issues
Also, this removes the not-recommended usage of "travis_retry" and adds "gpgconf --kill all".
2018-06-11 17:01:50 -07:00
Baldinof
c14ef6c61b Enable cgi bin for cli variant 2018-06-11 14:08:44 -07:00
Tianon Gravi
2fa5427d39 Fix wget: error getting response: Connection reset by peer 2018-05-31 21:43:38 -07:00
Tianon Gravi
b045ba7c51 Add "--enable-option-checking=fatal" to ./configure invocations 2018-04-30 13:06:26 -07:00
Tianon Gravi
1df2501817 Switch to "--with-mhash" instead (to break less users) 2018-04-26 13:45:14 -07:00
Tianon Gravi
b6c589131a Add "--disable-hash" (so it can be compiled after-the-fact)
This allows for users of the image to `docker-php-ext-configure hash --with-mhash`, for example.
2018-04-19 14:15:39 -07:00
yosifkit
7707290c53
Merge pull request #605 from infosiftr/shared-sodium
Update sodium extension to be shared (so it can be replaced if necessary by users)
2018-03-21 13:34:44 -07:00
Tianon Gravi
fe07cedc05 Update/fix PHPIZE_DEPS comment
Closes #597
2018-03-21 11:23:32 -07:00
Tianon Gravi
604dfc0baf Update sodium extension to be shared (so it can be replaced if necessary by users) 2018-03-21 11:10:03 -07:00
Joe Ferguson
fd8e15250a Add libsodium to 7.2+ 2018-02-05 16:06:59 -08:00
Joe Ferguson
223086c062 Use bundled pcre to be closer to upstream and disable pcre-jit on unsupported platforms like s390x 2017-11-28 16:24:49 -08:00
Tianon Gravi
fc24121abd Add "libressl" persistently for "openssl_pkey_new" 2017-09-26 11:21:53 -07:00
Tianon Gravi
7c45279501 Merge pull request #500 from infosiftr/scanelf
Adjust scanelf to properly detect runDeps
2017-09-25 09:22:23 -07:00
Tianon Gravi
0e3468fe7f Update Alpine 3.6+ to use "libressl" instead of "openssl" 2017-09-22 14:55:27 -07:00
Joe Ferguson
b862248552 Adjust scanelf to properly detect runDeps 2017-09-22 14:18:14 -07:00
Tianon Gravi
ddc7084c8a Add 7.2.0alpha3 2017-07-10 12:05:50 -07:00
Tianon Gravi
014a5a69e6 Parameterize Alpine versions and add more links to update.sh 2017-06-09 13:35:10 -07:00
Tianon Gravi
c48c629568 Explicitly invoke "pecl update-channels" at build time to ensure our channel definitions are up-to-date 2017-05-31 15:04:31 -07:00
Joe Ferguson
76a1c5ca16 Sort apt/apk package lines 2017-05-12 13:03:16 -07:00
Eugene Kirillov
87a95b77fb Add PCRE lib to PHPIZE_DEPS 2017-05-12 15:57:15 +03:00
Tianon Gravi
6844e717a5 Add explicit "--build" to our "./configure" invocations 2017-05-10 11:14:13 -07:00
Tianon Gravi
3ac528cf10 Revert "Upgrade alpine to v3.5" 2017-01-05 10:06:53 -08:00
Tianon Gravi
58fbb6e660 Swap "openssl" for "libressl" to account for the change in Alpine 3.5 2017-01-04 11:00:35 -08:00
Peter Dave Hello
8314ebc484 Upgrade alpine to v3.5 2016-12-29 00:08:48 +08:00
yosifkit
b66c0fa028 Merge pull request #349 from infosiftr/docker-php-entrypoint
Add simple initial entrypoint for supporting "docker run php --flags"
2016-12-15 16:12:25 -08:00
Tianon Gravi
703ba52e0c Add simple initial entrypoint for supporting "docker run php --flags" 2016-12-15 10:36:09 -08:00
Joe Ferguson
bb4874c9af Switch CFLAGS to PHP_CFLAGS, so we can keep pie without breaking users 2016-12-12 15:19:57 -08:00
Joe Ferguson
0311282445 Add explanation for clfags and ldflags 2016-12-05 15:33:53 -08:00
Joe Ferguson
cae3c03efd Add cflags and ldflags for security and portability 2016-12-05 12:47:12 -08:00
Tianon Gravi
23533b7185 Use the appropriate APIs to gather information about releases _and_ pre-releases, and verify as much information about the downloads as is available 2016-10-17 09:09:36 -07:00
Tianon Gravi
2f96a00aaa Use "https" for communications with "php.net" where possible 2016-08-22 15:47:04 -07:00
Tianon Gravi
01ab2f7ff3 Minor whitespace and alphabetizing tweaks 2016-08-09 09:26:03 -07:00
Patrick O'Meara
1d332d0e8f enable-ftp
--enable-ftp as some php function need it compiled statically

fixes docker-library/php#236
2016-08-09 17:45:09 +10:00
Alex Wilson
5842c49fd9
Shuffling around order of optional arguments so as to override default configure options. 2016-07-29 14:52:05 +01:00
yosifkit
1a4763005a Remove extracted php src (#256)
* Remove php src the right way for lightweight containers.

* Adapt docker-php-ext-* scripts to check exts against /available-exts generated file.

* Improve docker-php-source script

 - swap spaces to tabs to match
 - use gnu tar for `--strip-components`
 - cache known extension list in `/usr/src/`
 - remove extra output

* Changes per tianon's comments
2016-07-12 17:12:43 -07:00
Tianon Gravi
3099068733 Update to alpine:3.4 2016-06-07 08:54:07 -07:00