[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v4 38/40] containers.yml: build with docker.py tooling
From: |
Alex Bennée |
Subject: |
[PATCH v4 38/40] containers.yml: build with docker.py tooling |
Date: |
Wed, 1 Jul 2020 14:56:50 +0100 |
Instead of building the docker files directly use the same docker.py
scripting as we do for building locally. This should help ensure we
use the exact same steps and allow us to cache properly when building
locally.
To get this working you have to have a fairly recent docker binary
otherwise you will see the error message:
=> ERROR importing cache manifest from registry.gitlab....
So far docker 19.03.12 works (from the docker apt repos) but 18.09.1,
build 4c52b90 which is packaged in Debian Buster fails.
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
.gitlab-ci.d/containers.yml | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/.gitlab-ci.d/containers.yml b/.gitlab-ci.d/containers.yml
index ea350eacff7..b1e39cfd9ac 100644
--- a/.gitlab-ci.d/containers.yml
+++ b/.gitlab-ci.d/containers.yml
@@ -6,14 +6,17 @@
before_script:
- export TAG="$CI_REGISTRY_IMAGE/qemu/$NAME:latest"
- export COMMON_TAG="$CI_REGISTRY/qemu-project/qemu/$NAME:latest"
+ - apk add python3
- docker info
- docker login registry.gitlab.com -u "$CI_REGISTRY_USER" -p
"$CI_REGISTRY_PASSWORD"
script:
+ - echo "TAG:$TAG"
+ - echo "COMMON_TAG:$COMMON_TAG"
- docker pull "$TAG" || docker pull "$COMMON_TAG" || true
- - sed -i -e "s,FROM qemu/,FROM $CI_REGISTRY_IMAGE/qemu/,"
tests/docker/dockerfiles/$NAME.docker
- - DOCKER_BUILDKIT=1 docker build --cache-from "$TAG" --cache-from
"$COMMON_TAG" --tag "$TAG"
- --build-arg BUILDKIT_INLINE_CACHE=1
- -f
"tests/docker/dockerfiles/$NAME.docker" tests/docker/dockerfiles
+ - ./tests/docker/docker.py --engine docker build
+ -t "qemu:$NAME" -f "tests/docker/dockerfiles/$NAME.docker"
+ -r $CI_REGISTRY_IMAGE
+ - docker tag "qemu:$NAME" "$TAG"
- docker push "$TAG"
after_script:
- docker logout
--
2.20.1
- [PATCH v4 35/40] gitlab: add avocado asset caching, (continued)
- [PATCH v4 35/40] gitlab: add avocado asset caching, Alex Bennée, 2020/07/01
- [PATCH v4 16/40] tests/docker: check for an parameters not empty string, Alex Bennée, 2020/07/01
- [PATCH v4 27/40] tests/acceptance: fix dtb path for machine_rx_gdbsim, Alex Bennée, 2020/07/01
- [PATCH v4 14/40] tests/vm: switch from optsparse to argparse, Alex Bennée, 2020/07/01
- [PATCH v4 33/40] linux-user/elfload: use MAP_FIXED_NOREPLACE in pgb_reserved_va, Alex Bennée, 2020/07/01
- [PATCH v4 31/40] tests/tcg: add more default compilers to configure.sh, Alex Bennée, 2020/07/01
- [PATCH v4 40/40] shippable: pull images from registry instead of building, Alex Bennée, 2020/07/01
- [PATCH v4 29/40] tests/acceptance: skip LinuxInitrd 2gib with v4.16 on GitLab, Alex Bennée, 2020/07/01
- [PATCH v4 38/40] containers.yml: build with docker.py tooling,
Alex Bennée <=
- [PATCH v4 28/40] tests/acceptance: skip multicore mips_malta tests on GitLab, Alex Bennée, 2020/07/01
- Re: [PATCH v4 28/40] tests/acceptance: skip multicore mips_malta tests on GitLab, Aleksandar Markovic, 2020/07/01
[PATCH v4 18/40] .gitignore: un-ignore .gitlab-ci.d, Alex Bennée, 2020/07/01
[PATCH v4 36/40] gitlab: split build-disabled into two phases, Alex Bennée, 2020/07/01