Merge pull request #982 from Automattic/fix/context #990

Job	Run time
Prepare build matrix	3s
Build Docker image (ref: 6.7.1, tag: 6.7)	1m 59s
Build Docker image (ref: 6.6.2, tag: 6.6)	1m 27s
Build Docker image (ref: 6.5.5, tag: 6.5)	2m 0s
Build Docker image (ref: 6.4.5, tag: 6.4)	2m 0s
Build Docker image (ref: 6.3.5, tag: 6.3)	1m 40s
Build Docker image (ref: 6.2.6, tag: 6.2)	1m 58s
Build Docker image (ref: 6.1.7, tag: 6.1)	1m 26s
Build Docker image (ref: 6.0.9, tag: 6.0)	1m 32s
Build Docker image (ref: HEAD, tag: trunk)	1m 41s
	15m 46s

Provide feedback