Commit 213fb32

committed

removed duplicate fpm env vars

1 parent a23a3f7 commit 213fb32Copy full SHA for 213fb32

File tree

-17

lines changed

-17

lines changed

Lines changed: 6 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ Example:`
`17`	`17`
`18`	`18`	`./build.sh devimage:latest --env dev --php 7.1.8`
`19`	`19`
`20`		`-Then you can base your containers on the new built image:`
	`20`	`+Then you can start your container with the built image:`
`21`	`21`
`22`	`22`	`docker run -d -p 31287:80 --name dev-container devimage:latest`
`23`	`23`
`@@ -30,12 +30,12 @@ Or base your images on it (Dockerfile):`
`30`	`30`
`31`	`31`	`EXPOSE 80`
`32`	`32`
`33`		`-Available PHP versions:`
	`33`	`+Available PHP versions:`
`34`	`34`
`35`		`- - 7.2.0beta2`
`36`		`- - 7.1.8 (default)`
`37`		`- - 7.0.22`
`38`		`- - 5.6.31`
	`35`	`+ - 7.2-rc`
	`36`	`+ - 7.1 (default)`
	`37`	`+ - 7.0`
	`38`	`+ - 5.6`
`39`	`39`
`40`	`40`	`For a complete list see https://store.docker.com/images/php`
`41`	`41`

Lines changed: 3 additions & 11 deletions

Original file line number	Diff line number	Diff line change
`@@ -412,14 +412,6 @@ pm.max_spare_servers = 3`
`412`	`412`	`;php_admin_flag[log_errors] = on`
`413`	`413`	`;php_admin_value[memory_limit] = 32M`
`414`	`414`
`415`		`-;container environment variables`
`416`		`-env[PHP_INI_DIR] = "/usr/local/etc/php"`
`417`		`-env[PHP_ASC_URL] = "https://secure.php.net/get/php-7.1.8.tar.xz.asc/from/this/mirror"`
`418`		`-env[PHP_CFLAGS] = "-fstack-protector-strong -fpic -fpie -O2"`
`419`		`-env[PHP_URL] = "https://secure.php.net/get/php-7.1.8.tar.xz/from/this/mirror"`
`420`		`-env[PHP_LDFLAGS] = "-Wl,-O1 -Wl,--hash-style"`
`421`		`-env[PHP_CPPFLAGS] = "-fstack-protector-strong -fpic -fpie -O2"`
`422`		`-env[PHP_SHA256] = "8943858738604acb33ecedb865d6c4051eeffe4e2d06f3a3c8f794daccaa2aab"`
`423`		`-env[PHP_VERSION] = "7.1.8"`
`424`		`-env[PHP_EXTRA_CONFIGURE_ARGS] = "--enable-fpm --with-fpm-user"`
`425`		`-env[ADRIAN_CONFIG_VAR] = "test 123"`
	`415`	`+;pool name variable`
	`416`	`+env[FPM_POOL] = "www"`
	`417`	`+env[FPM_POOL_CONFIG] = "/usr/local/etc/php-fpm.d/www.conf"`

Comments

(0)