containers.yml: build with docker.py tooling
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> Message-Id: <20200701135652.1366-39-alex.bennee@linaro.org>
This commit is contained in:
parent
f2c5466c78
commit
c8e6793903
|
@ -6,14 +6,17 @@
|
||||||
before_script:
|
before_script:
|
||||||
- export TAG="$CI_REGISTRY_IMAGE/qemu/$NAME:latest"
|
- export TAG="$CI_REGISTRY_IMAGE/qemu/$NAME:latest"
|
||||||
- export COMMON_TAG="$CI_REGISTRY/qemu-project/qemu/$NAME:latest"
|
- export COMMON_TAG="$CI_REGISTRY/qemu-project/qemu/$NAME:latest"
|
||||||
|
- apk add python3
|
||||||
- docker info
|
- docker info
|
||||||
- docker login registry.gitlab.com -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD"
|
- docker login registry.gitlab.com -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD"
|
||||||
script:
|
script:
|
||||||
|
- echo "TAG:$TAG"
|
||||||
|
- echo "COMMON_TAG:$COMMON_TAG"
|
||||||
- docker pull "$TAG" || docker pull "$COMMON_TAG" || true
|
- docker pull "$TAG" || docker pull "$COMMON_TAG" || true
|
||||||
- sed -i -e "s,FROM qemu/,FROM $CI_REGISTRY_IMAGE/qemu/," tests/docker/dockerfiles/$NAME.docker
|
- ./tests/docker/docker.py --engine docker build
|
||||||
- DOCKER_BUILDKIT=1 docker build --cache-from "$TAG" --cache-from "$COMMON_TAG" --tag "$TAG"
|
-t "qemu/$NAME" -f "tests/docker/dockerfiles/$NAME.docker"
|
||||||
--build-arg BUILDKIT_INLINE_CACHE=1
|
-r $CI_REGISTRY_IMAGE
|
||||||
-f "tests/docker/dockerfiles/$NAME.docker" tests/docker/dockerfiles
|
- docker tag "qemu/$NAME" "$TAG"
|
||||||
- docker push "$TAG"
|
- docker push "$TAG"
|
||||||
after_script:
|
after_script:
|
||||||
- docker logout
|
- docker logout
|
||||||
|
|
Loading…
Reference in New Issue