From dae506032f50a599fb2cd0574ef0a33928cb80b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Date: Tue, 1 Dec 2020 19:17:04 +0000 Subject: [PATCH] gitlab: rename dockerfiles to have a "ci-" prefix MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This means the dockerfile has the same name as the generated container image. Signed-off-by: Daniel P. Berrangé --- .gitlab-ci.yml | 2 +- .../{centos-7.Dockerfile => ci-centos-7.Dockerfile} | 0 .../{centos-8.Dockerfile => ci-centos-8.Dockerfile} | 0 ...ntos-stream.Dockerfile => ci-centos-stream.Dockerfile} | 0 .../{debian-10.Dockerfile => ci-debian-10.Dockerfile} | 0 .../{debian-sid.Dockerfile => ci-debian-sid.Dockerfile} | 0 .../{fedora-32.Dockerfile => ci-fedora-32.Dockerfile} | 0 .../{fedora-33.Dockerfile => ci-fedora-33.Dockerfile} | 0 ...kerfile => ci-fedora-rawhide-cross-mingw32.Dockerfile} | 0 ...kerfile => ci-fedora-rawhide-cross-mingw64.Dockerfile} | 0 ...ra-rawhide.Dockerfile => ci-fedora-rawhide.Dockerfile} | 0 ...opensuse-151.Dockerfile => ci-opensuse-151.Dockerfile} | 0 .../{ubuntu-1804.Dockerfile => ci-ubuntu-1804.Dockerfile} | 0 .../{ubuntu-2004.Dockerfile => ci-ubuntu-2004.Dockerfile} | 0 ci/containers/refresh | 8 ++++---- 15 files changed, 5 insertions(+), 5 deletions(-) rename ci/containers/{centos-7.Dockerfile => ci-centos-7.Dockerfile} (100%) rename ci/containers/{centos-8.Dockerfile => ci-centos-8.Dockerfile} (100%) rename ci/containers/{centos-stream.Dockerfile => ci-centos-stream.Dockerfile} (100%) rename ci/containers/{debian-10.Dockerfile => ci-debian-10.Dockerfile} (100%) rename ci/containers/{debian-sid.Dockerfile => ci-debian-sid.Dockerfile} (100%) rename ci/containers/{fedora-32.Dockerfile => ci-fedora-32.Dockerfile} (100%) rename ci/containers/{fedora-33.Dockerfile => ci-fedora-33.Dockerfile} (100%) rename ci/containers/{fedora-rawhide-cross-mingw32.Dockerfile => ci-fedora-rawhide-cross-mingw32.Dockerfile} (100%) rename ci/containers/{fedora-rawhide-cross-mingw64.Dockerfile => ci-fedora-rawhide-cross-mingw64.Dockerfile} (100%) rename ci/containers/{fedora-rawhide.Dockerfile => ci-fedora-rawhide.Dockerfile} (100%) rename ci/containers/{opensuse-151.Dockerfile => ci-opensuse-151.Dockerfile} (100%) rename ci/containers/{ubuntu-1804.Dockerfile => ci-ubuntu-1804.Dockerfile} (100%) rename ci/containers/{ubuntu-2004.Dockerfile => ci-ubuntu-2004.Dockerfile} (100%) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 55e1ffb..e8f68fd 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/containers/$NAME.Dockerfile" ci/containers + - docker build --cache-from "$TAG" --cache-from "$COMMON_TAG" --tag "$TAG" -f "ci/containers/ci-$NAME.Dockerfile" ci/containers - docker push "$TAG" after_script: - docker logout diff --git a/ci/containers/centos-7.Dockerfile b/ci/containers/ci-centos-7.Dockerfile similarity index 100% rename from ci/containers/centos-7.Dockerfile rename to ci/containers/ci-centos-7.Dockerfile diff --git a/ci/containers/centos-8.Dockerfile b/ci/containers/ci-centos-8.Dockerfile similarity index 100% rename from ci/containers/centos-8.Dockerfile rename to ci/containers/ci-centos-8.Dockerfile diff --git a/ci/containers/centos-stream.Dockerfile b/ci/containers/ci-centos-stream.Dockerfile similarity index 100% rename from ci/containers/centos-stream.Dockerfile rename to ci/containers/ci-centos-stream.Dockerfile diff --git a/ci/containers/debian-10.Dockerfile b/ci/containers/ci-debian-10.Dockerfile similarity index 100% rename from ci/containers/debian-10.Dockerfile rename to ci/containers/ci-debian-10.Dockerfile diff --git a/ci/containers/debian-sid.Dockerfile b/ci/containers/ci-debian-sid.Dockerfile similarity index 100% rename from ci/containers/debian-sid.Dockerfile rename to ci/containers/ci-debian-sid.Dockerfile diff --git a/ci/containers/fedora-32.Dockerfile b/ci/containers/ci-fedora-32.Dockerfile similarity index 100% rename from ci/containers/fedora-32.Dockerfile rename to ci/containers/ci-fedora-32.Dockerfile diff --git a/ci/containers/fedora-33.Dockerfile b/ci/containers/ci-fedora-33.Dockerfile similarity index 100% rename from ci/containers/fedora-33.Dockerfile rename to ci/containers/ci-fedora-33.Dockerfile diff --git a/ci/containers/fedora-rawhide-cross-mingw32.Dockerfile b/ci/containers/ci-fedora-rawhide-cross-mingw32.Dockerfile similarity index 100% rename from ci/containers/fedora-rawhide-cross-mingw32.Dockerfile rename to ci/containers/ci-fedora-rawhide-cross-mingw32.Dockerfile diff --git a/ci/containers/fedora-rawhide-cross-mingw64.Dockerfile b/ci/containers/ci-fedora-rawhide-cross-mingw64.Dockerfile similarity index 100% rename from ci/containers/fedora-rawhide-cross-mingw64.Dockerfile rename to ci/containers/ci-fedora-rawhide-cross-mingw64.Dockerfile diff --git a/ci/containers/fedora-rawhide.Dockerfile b/ci/containers/ci-fedora-rawhide.Dockerfile similarity index 100% rename from ci/containers/fedora-rawhide.Dockerfile rename to ci/containers/ci-fedora-rawhide.Dockerfile diff --git a/ci/containers/opensuse-151.Dockerfile b/ci/containers/ci-opensuse-151.Dockerfile similarity index 100% rename from ci/containers/opensuse-151.Dockerfile rename to ci/containers/ci-opensuse-151.Dockerfile diff --git a/ci/containers/ubuntu-1804.Dockerfile b/ci/containers/ci-ubuntu-1804.Dockerfile similarity index 100% rename from ci/containers/ubuntu-1804.Dockerfile rename to ci/containers/ci-ubuntu-1804.Dockerfile diff --git a/ci/containers/ubuntu-2004.Dockerfile b/ci/containers/ci-ubuntu-2004.Dockerfile similarity index 100% rename from ci/containers/ubuntu-2004.Dockerfile rename to ci/containers/ci-ubuntu-2004.Dockerfile diff --git a/ci/containers/refresh b/ci/containers/refresh index a1bcffe..dfd62d1 100755 --- a/ci/containers/refresh +++ b/ci/containers/refresh @@ -14,7 +14,7 @@ then exit 1 fi -HOSTS=$($LCITOOL hosts | grep -v -E '(freebsd|macos)' | sed -e 's/libvirt-//') +HOSTS=$($LCITOOL hosts | grep -v -E '(freebsd|macos)') for host in $HOSTS do @@ -22,14 +22,14 @@ do then for cross in mingw32 mingw64 do - $LCITOOL dockerfile libvirt-$host libvirt,libvirt-glib,gtk-vnc,virt-viewer --cross $cross >$host-cross-$cross.Dockerfile + $LCITOOL dockerfile $host libvirt,libvirt-glib,gtk-vnc,virt-viewer --cross $cross > ci-$host-cross-$cross.Dockerfile done fi if test "$host" = "centos-8" || test "$host" = "centos-stream" then - $LCITOOL dockerfile libvirt-$host libvirt+minimal,libvirt-glib,gtk-vnc,virt-viewer > $host.Dockerfile + $LCITOOL dockerfile $host libvirt+minimal,libvirt-glib,gtk-vnc,virt-viewer > ci-$host.Dockerfile else - $LCITOOL dockerfile libvirt-$host libvirt+dist,libvirt-glib+dist,gtk-vnc+dist,virt-viewer > $host.Dockerfile + $LCITOOL dockerfile $host libvirt+dist,libvirt-glib+dist,gtk-vnc+dist,virt-viewer > ci-$host.Dockerfile fi done