From a9d320e09a196e4386fd91b2b0abe85c4f9c56c3 Mon Sep 17 00:00:00 2001 From: Andrea Bolognani Date: Wed, 17 Jun 2020 20:25:39 +0200 Subject: ci: Move Dockerfiles to a subdir This is consistent to how libvirt organizes its files, and ensures things will remain tidy even as we introduce new features such as, later on, Cirrus CI support. Signed-off-by: Andrea Bolognani --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.gitlab-ci.yml') diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 05f514d..bd94cb1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -43,7 +43,7 @@ stages: - docker login registry.gitlab.com -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" script: - docker pull "$TAG" || docker pull "$COMMON_TAG" || true - - docker build --cache-from "$TAG" --cache-from "$COMMON_TAG" --tag "$TAG" -f "ci/ci-$NAME.Dockerfile" ci + - docker build --cache-from "$TAG" --cache-from "$COMMON_TAG" --tag "$TAG" -f "ci/containers/ci-$NAME.Dockerfile" ci - docker push "$TAG" after_script: - docker logout -- cgit v1.2.1