gitlab: Use plain docker in container-template.yml
authorFabiano Rosas <farosas@suse.de>
Tue, 28 Feb 2023 19:06:44 +0000 (19:06 +0000)
committerAlex Bennée <alex.bennee@linaro.org>
Wed, 1 Mar 2023 10:32:25 +0000 (10:32 +0000)
commit94b8b146df84ba472f461398d93fb9cdf0db8f94
tree22cd8fd84d76d3ff7e0ac1fd8602bf45cfbbb6fe
parent483c3b17ae720dbe47a1eed3f031e983c6b9b19e
gitlab: Use plain docker in container-template.yml

Our dockerfiles no longer reference layers from other qemu images so
we can now use 'docker build' on them.

Also reinstate the caching that was disabled due to bad interactions
with certain runners. See commit 6ddc3dc7a8 ("tests/docker: don't use
BUILDKIT in GitLab either"). We now believe those issues to be fixed.

The COMMON_TAG needed to be fixed for the caching to work. The
docker.py script was not using the variable, but constructing the
correct URL directly.

Signed-off-by: Fabiano Rosas <farosas@suse.de>
Tested-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Message-Id: <20230227151110.31455-2-farosas@suse.de>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20230228190653.1602033-16-alex.bennee@linaro.org>
.gitlab-ci.d/container-template.yml