mirror of
https://gitlab.com/libvirt/libvirt-python.git
synced 2025-12-02 12:23:47 +03:00
gitlab: replace "libvirt-" prefix with "ci-" in dockerfiles
This makes the dockerfile name match the output container name Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
@@ -18,7 +18,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
|
||||
|
||||
@@ -18,10 +18,10 @@ HOSTS=$($LCITOOL hosts | grep -v -E '(freebsd|macos)')
|
||||
|
||||
for host in $HOSTS
|
||||
do
|
||||
if test "$host" = "libvirt-centos-8"
|
||||
if test "$host" = "centos-8"
|
||||
then
|
||||
$LCITOOL dockerfile $host libvirt+minimal,libvirt+dist,libvirt-python > $host.Dockerfile
|
||||
$LCITOOL dockerfile $host libvirt+minimal,libvirt+dist,libvirt-python > ci-$host.Dockerfile
|
||||
else
|
||||
$LCITOOL dockerfile $host libvirt+dist,libvirt-python > $host.Dockerfile
|
||||
$LCITOOL dockerfile $host libvirt+dist,libvirt-python > ci-$host.Dockerfile
|
||||
fi
|
||||
done
|
||||
|
||||
Reference in New Issue
Block a user