Remove obsolete if in Dockerfile template (#1670)

jnoordsij · web-flow · commit fdcffeaea4df · 2026-06-30T09:57:38.000-07:00
All mentioned versions have had subsequent releases
diff --git a/Dockerfile-linux.template b/Dockerfile-linux.template
@@ -520,13 +520,11 @@ RUN set -eux; \
 	\
 	cp -v php-fpm.conf.default php-fpm.conf; \
 	cp -v php-fpm.d/www.conf.default php-fpm.d/www.conf; \
-{{ if .version | IN("8.2.30", "8.3.29", "8.4.16", "8.5.1") then "" else ( -}}
 	\
 	# comment out localhost-only listen address
 	grep -E '^listen = 127.0.0.1:9000' php-fpm.d/www.conf; \
 	sed -ri 's/^(listen = 127.0.0.1:9000)/;\1/' php-fpm.d/www.conf; \
 	grep -E '^;listen = 127.0.0.1:9000' php-fpm.d/www.conf; \
-{{ ) end -}}
 	\
 	{ \
 		echo '[global]'; \

Original file line number	Diff line number	Diff line change
`@@ -520,13 +520,11 @@ RUN set -eux; \`
`520`	`520`	`\`
`521`	`521`	`cp -v php-fpm.conf.default php-fpm.conf; \`
`522`	`522`	`cp -v php-fpm.d/www.conf.default php-fpm.d/www.conf; \`
`523`		`-{{ if .version \| IN("8.2.30", "8.3.29", "8.4.16", "8.5.1") then "" else ( -}}`
`524`	`523`	`\`
`525`	`524`	`# comment out localhost-only listen address`
`526`	`525`	`grep -E '^listen = 127.0.0.1:9000' php-fpm.d/www.conf; \`
`527`	`526`	`sed -ri 's/^(listen = 127.0.0.1:9000)/;\1/' php-fpm.d/www.conf; \`
`528`	`527`	`grep -E '^;listen = 127.0.0.1:9000' php-fpm.d/www.conf; \`
`529`		`-{{ ) end -}}`
`530`	`528`	`\`
`531`	`529`	`{ \`
`532`	`530`	`echo '[global]'; \`