From 3d3f0fbe26324273af1bbe8dff8b2a7321e1de47 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Date: Mon, 23 Nov 2020 17:58:36 +0000 Subject: [PATCH] gitlab: move dockerfiles into ci/containers sub-directory MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This brings the repo into alignment with the main libvirt.git practice. Signed-off-by: Daniel P. Berrangé --- .gitlab-ci.yml | 2 +- ci/{ => containers}/centos-7.Dockerfile | 0 ci/{ => containers}/centos-8.Dockerfile | 0 ci/{ => containers}/centos-stream.Dockerfile | 0 ci/{ => containers}/debian-10.Dockerfile | 0 ci/{ => containers}/debian-sid.Dockerfile | 0 ci/{ => containers}/fedora-31.Dockerfile | 0 ci/{ => containers}/fedora-32.Dockerfile | 0 ci/{ => containers}/fedora-rawhide-cross-mingw32.Dockerfile | 0 ci/{ => containers}/fedora-rawhide-cross-mingw64.Dockerfile | 0 ci/{ => containers}/fedora-rawhide.Dockerfile | 0 ci/{ => containers}/opensuse-151.Dockerfile | 0 ci/{ => containers}/refresh | 0 ci/{ => containers}/ubuntu-1804.Dockerfile | 0 ci/{ => containers}/ubuntu-2004.Dockerfile | 0 15 files changed, 1 insertion(+), 1 deletion(-) rename ci/{ => containers}/centos-7.Dockerfile (100%) rename ci/{ => containers}/centos-8.Dockerfile (100%) rename ci/{ => containers}/centos-stream.Dockerfile (100%) rename ci/{ => containers}/debian-10.Dockerfile (100%) rename ci/{ => containers}/debian-sid.Dockerfile (100%) rename ci/{ => containers}/fedora-31.Dockerfile (100%) rename ci/{ => containers}/fedora-32.Dockerfile (100%) rename ci/{ => containers}/fedora-rawhide-cross-mingw32.Dockerfile (100%) rename ci/{ => containers}/fedora-rawhide-cross-mingw64.Dockerfile (100%) rename ci/{ => containers}/fedora-rawhide.Dockerfile (100%) rename ci/{ => containers}/opensuse-151.Dockerfile (100%) rename ci/{ => containers}/refresh (100%) rename ci/{ => containers}/ubuntu-1804.Dockerfile (100%) rename ci/{ => containers}/ubuntu-2004.Dockerfile (100%) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index cefb781..7d5a016 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -15,7 +15,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/$NAME.Dockerfile" ci + - docker build --cache-from "$TAG" --cache-from "$COMMON_TAG" --tag "$TAG" -f "ci/containers/$NAME.Dockerfile" ci/containers - docker push "$TAG" after_script: - docker logout diff --git a/ci/centos-7.Dockerfile b/ci/containers/centos-7.Dockerfile similarity index 100% rename from ci/centos-7.Dockerfile rename to ci/containers/centos-7.Dockerfile diff --git a/ci/centos-8.Dockerfile b/ci/containers/centos-8.Dockerfile similarity index 100% rename from ci/centos-8.Dockerfile rename to ci/containers/centos-8.Dockerfile diff --git a/ci/centos-stream.Dockerfile b/ci/containers/centos-stream.Dockerfile similarity index 100% rename from ci/centos-stream.Dockerfile rename to ci/containers/centos-stream.Dockerfile diff --git a/ci/debian-10.Dockerfile b/ci/containers/debian-10.Dockerfile similarity index 100% rename from ci/debian-10.Dockerfile rename to ci/containers/debian-10.Dockerfile diff --git a/ci/debian-sid.Dockerfile b/ci/containers/debian-sid.Dockerfile similarity index 100% rename from ci/debian-sid.Dockerfile rename to ci/containers/debian-sid.Dockerfile diff --git a/ci/fedora-31.Dockerfile b/ci/containers/fedora-31.Dockerfile similarity index 100% rename from ci/fedora-31.Dockerfile rename to ci/containers/fedora-31.Dockerfile diff --git a/ci/fedora-32.Dockerfile b/ci/containers/fedora-32.Dockerfile similarity index 100% rename from ci/fedora-32.Dockerfile rename to ci/containers/fedora-32.Dockerfile diff --git a/ci/fedora-rawhide-cross-mingw32.Dockerfile b/ci/containers/fedora-rawhide-cross-mingw32.Dockerfile similarity index 100% rename from ci/fedora-rawhide-cross-mingw32.Dockerfile rename to ci/containers/fedora-rawhide-cross-mingw32.Dockerfile diff --git a/ci/fedora-rawhide-cross-mingw64.Dockerfile b/ci/containers/fedora-rawhide-cross-mingw64.Dockerfile similarity index 100% rename from ci/fedora-rawhide-cross-mingw64.Dockerfile rename to ci/containers/fedora-rawhide-cross-mingw64.Dockerfile diff --git a/ci/fedora-rawhide.Dockerfile b/ci/containers/fedora-rawhide.Dockerfile similarity index 100% rename from ci/fedora-rawhide.Dockerfile rename to ci/containers/fedora-rawhide.Dockerfile diff --git a/ci/opensuse-151.Dockerfile b/ci/containers/opensuse-151.Dockerfile similarity index 100% rename from ci/opensuse-151.Dockerfile rename to ci/containers/opensuse-151.Dockerfile diff --git a/ci/refresh b/ci/containers/refresh similarity index 100% rename from ci/refresh rename to ci/containers/refresh diff --git a/ci/ubuntu-1804.Dockerfile b/ci/containers/ubuntu-1804.Dockerfile similarity index 100% rename from ci/ubuntu-1804.Dockerfile rename to ci/containers/ubuntu-1804.Dockerfile diff --git a/ci/ubuntu-2004.Dockerfile b/ci/containers/ubuntu-2004.Dockerfile similarity index 100% rename from ci/ubuntu-2004.Dockerfile rename to ci/containers/ubuntu-2004.Dockerfile