On Wed, Mar 16, 2022 at 12:03:09PM +0100, Erik Skultety wrote: > On Tue, Mar 15, 2022 at 12:33:31PM +0100, Martin Kletzander wrote: > > On Tue, Mar 15, 2022 at 12:15:03PM +0100, Martin Kletzander wrote: > > > Signed-off-by: Martin Kletzander <mkletzan@xxxxxxxxxx> > > > --- > > > ci/containers/alpine-314.Dockerfile | 82 ++++++++++++++++++++++++++++ > > > ci/containers/alpine-edge.Dockerfile | 81 +++++++++++++++++++++++++++ > > > ci/gitlab.yml | 35 +++++++++++- > > > ci/manifest.yml | 8 +++ > > > 4 files changed, 204 insertions(+), 2 deletions(-) > > > create mode 100644 ci/containers/alpine-314.Dockerfile > > > create mode 100644 ci/containers/alpine-edge.Dockerfile > > > > > > diff --git a/ci/gitlab.yml b/ci/gitlab.yml > > > index cc03a2fe49f8..a19ec2a23f09 100644 > > > --- a/ci/gitlab.yml > > > +++ b/ci/gitlab.yml > > > @@ -10,8 +10,7 @@ > > > stage: containers > > > needs: [] > > > services: > > > - - name: registry.gitlab.com/libvirt/libvirt-ci/docker-dind:master > > > - alias: docker > > > + - docker:dind > > > > Oops, I did not notice this before sending, not sure if we can switch > > back already, just let me know if I should remove this before (eventual) > > pushing, but the build works for me. > > This was discussed here [1] and the only important bit was to keep the > container itself around for non-master branches, so, yes, we should be able to > make the switch - I posted the change as part of my patches yesterday as well > :). > > Erik Sorry, missed the URL [1] https://gitlab.com/libvirt/libvirt-ci/-/merge_requests/228
