mirror of
https://github.com/libvirt/libvirt.git
synced 2025-02-25 18:55:26 -06: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:
parent
82a7f760df
commit
4e750e932a
@ -27,7 +27,7 @@ stages:
|
|||||||
- 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:
|
||||||
- docker pull "$TAG" || docker pull "$COMMON_TAG" || true
|
- 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"
|
- docker push "$TAG"
|
||||||
after_script:
|
after_script:
|
||||||
- docker logout
|
- docker logout
|
||||||
|
@ -19,24 +19,24 @@ HOSTS=$($LCITOOL hosts | grep -Ev 'freebsd|macos')
|
|||||||
for host in $HOSTS
|
for host in $HOSTS
|
||||||
do
|
do
|
||||||
case "$host" in
|
case "$host" in
|
||||||
libvirt-fedora-rawhide)
|
fedora-rawhide)
|
||||||
for cross in mingw32 mingw64
|
for cross in mingw32 mingw64
|
||||||
do
|
do
|
||||||
$LCITOOL dockerfile $host libvirt --cross $cross >$host-cross-$cross.Dockerfile
|
$LCITOOL dockerfile $host libvirt --cross $cross > ci-$host-cross-$cross.Dockerfile
|
||||||
done
|
done
|
||||||
;;
|
;;
|
||||||
libvirt-debian-*)
|
debian-*)
|
||||||
for cross in aarch64 armv6l armv7l i686 mips mips64el mipsel ppc64le s390x
|
for cross in aarch64 armv6l armv7l i686 mips mips64el mipsel ppc64le s390x
|
||||||
do
|
do
|
||||||
if test "$host-cross-$cross" = "libvirt-debian-9-cross-i686" ||
|
if test "$host-cross-$cross" = "debian-9-cross-i686" ||
|
||||||
test "$host-cross-$cross" = "libvirt-debian-sid-cross-mips"
|
test "$host-cross-$cross" = "debian-sid-cross-mips"
|
||||||
then
|
then
|
||||||
continue
|
continue
|
||||||
fi
|
fi
|
||||||
$LCITOOL dockerfile $host libvirt --cross $cross >$host-cross-$cross.Dockerfile
|
$LCITOOL dockerfile $host libvirt --cross $cross > ci-$host-cross-$cross.Dockerfile
|
||||||
done
|
done
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
$LCITOOL dockerfile $host libvirt >$host.Dockerfile
|
$LCITOOL dockerfile $host libvirt > ci-$host.Dockerfile
|
||||||
done
|
done
|
||||||
|
Loading…
Reference in New Issue
Block a user