Combine templates to a single file

[yosifkit]

I tried to keep the resulting changes to the generated Dockerfiles minimal but also minimize the template.

[yosifkit]

I figured since we extracted it, we could use it and not re-extract it via from, but so far it was only needed once

[tianon]

Generally, I like it! Just a few comments 👀

[tianon]

This block is very clever, but IMO will be more complex to maintain over time than just having the package list, especially since there are only three packages who actually share the same name between Debian and Alpine (and we have to duplicate the version checks anyways). 😬

[yosifkit]

I don't mind moving the "common" packages into both alpine and debian lists. What I like about it is that the list in the resulting Dockerfile is always sorted without having to manually sort the list along with {{ if .version then ( -}} packages.

[yosifkit]

To put it clearly, do we want to have maintain the sort on this:

{{ if is_alpine then ( -}}
	apk add --no-cache --virtual .build-deps \
		$PHPIZE_DEPS \
		argon2-dev \
		coreutils \ 
		curl-dev \
		libedit-dev \
{{ if (.version | version_id) >= ("7.2" | version_id) then ( -}}
		libsodium-dev \
{{ ) else "" end -}}
		libxml2-dev \
{{ if (.version | version_id) >= ("7.4" | version_id) then ( -}}
		linux-headers \
{{ ) else "" end -}}
{{ if (.version | version_id) >= ("7.4" | version_id) then ( -}}
		# oniguruma is part of mbstring in php 7.4+
		oniguruma-dev \
{{ ) else "" end -}}
		openssl-dev \
		sqlite-dev \
		# https://github.com/docker-library/php/issues/888
{{ ) else ( -}}
	\
	savedAptMark="$(apt-mark showmanual)"; \
	apt-get update; \
	apt-get install -y --no-install-recommends \
		${PHP_EXTRA_BUILD_DEPS:-} \
		libargon2-dev \
		libcurl4-openssl-dev \
		libedit-dev \
{{ if (.version | version_id) >= ("7.4" | version_id then ( -}}
		# oniguruma is part of mbstring in php 7.4+
		libonig-dev \
{{ ) else "" end -}}
{{ if (.version | version_id) >= ("7.2" | version_id) then ( -}}
		libsodium-dev \
{{ ) else "" end -}}
		libsqlite3-dev \
		libssl-dev \
		libxml2-dev \
		zlib1g-dev \
{{ ) end -}}

Or this (maybe some love to reduce indentation):

{{
	[
		[
			( if is_alpine then
				"$PHPIZE_DEPS",
				"argon2-dev",
				"coreutils", 
				"curl-dev",
				"libedit-dev",
				"libxml2-dev",
				"openssl-dev",
				"sqlite-dev",
				( if (.version | version_id) >= ("7.2" | version_id) then "libsodium-dev" else empty end ),
				# https://github.com/docker-library/php/issues/888
				( if (.version | version_id) >= ("7.4" | version_id) then "linux-headers" else empty end ),
				# oniguruma is part of mbstring in php 7.4+
				( if (.version | version_id) >= ("7.4" | version_id) then "oniguruma-dev" else empty end )
			else
				# debian packages
				"${PHP_EXTRA_BUILD_DEPS:-}",
				"libargon2-dev",
				"libcurl4-openssl-dev",
				"libedit-dev",
				"libsqlite3-dev",
				"libssl-dev",
				"libxml2-dev",,
				"zlib1g-dev"
				( if (.version | version_id) >= ("7.2" | version_id) then "libsodium-dev" else empty end ),
				# oniguruma is part of mbstring in php 7.4+
				( if (.version | version_id) >= ("7.4" | version_id) then "libonig-dev" else empty end )
			end )
		] | sort[] | (
-}}
		{{ . }} \
{{
		)
	] | add
-}}
	; \

[tianon]

hmm, I prefer the former (I've been moving the versioned bits to the end too, if they include a comment that otherwise breaks up the package list), but I defer to your preference 😄

[tianon]

TODO push these down instead of adding extra ENV (they're quirks of the previous templating engine); I think we can do this as a later improvement so that the Dockerfile changes here stay more minimal