1
0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-11 09:17:52 +03:00

gitlab: replace "libvirt-" prefix with "ci-" in dockerfiles

This makes the dockerfile name match the output container name

Reviewed-by: Erik Skultety <eskultet@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrangé 2020-12-01 15:22:09 +00:00
parent 82a7f760df
commit 4e750e932a
32 changed files with 8 additions and 8 deletions

View File

@ -27,7 +27,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/libvirt-$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

View File

@ -19,24 +19,24 @@ HOSTS=$($LCITOOL hosts | grep -Ev 'freebsd|macos')
for host in $HOSTS
do
case "$host" in
libvirt-fedora-rawhide)
fedora-rawhide)
for cross in mingw32 mingw64
do
$LCITOOL dockerfile $host libvirt --cross $cross >$host-cross-$cross.Dockerfile
$LCITOOL dockerfile $host libvirt --cross $cross > ci-$host-cross-$cross.Dockerfile
done
;;
libvirt-debian-*)
debian-*)
for cross in aarch64 armv6l armv7l i686 mips mips64el mipsel ppc64le s390x
do
if test "$host-cross-$cross" = "libvirt-debian-9-cross-i686" ||
test "$host-cross-$cross" = "libvirt-debian-sid-cross-mips"
if test "$host-cross-$cross" = "debian-9-cross-i686" ||
test "$host-cross-$cross" = "debian-sid-cross-mips"
then
continue
fi
$LCITOOL dockerfile $host libvirt --cross $cross >$host-cross-$cross.Dockerfile
$LCITOOL dockerfile $host libvirt --cross $cross > ci-$host-cross-$cross.Dockerfile
done
;;
esac
$LCITOOL dockerfile $host libvirt >$host.Dockerfile
$LCITOOL dockerfile $host libvirt > ci-$host.Dockerfile
done