gitlab: rename dockerfiles to have a "ci-" prefix

This means the dockerfile has the same name as the generated container
image.

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrangé 2020-12-01 19:17:04 +00:00
parent bf29e894c8
commit dae506032f
15 changed files with 5 additions and 5 deletions

View File

@ -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

View File

@ -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