From 95d9bad7625c0bdd6a085fa0c32b171a3aef9e5c Mon Sep 17 00:00:00 2001 From: sfrancois Date: Wed, 19 Jul 2023 14:23:58 +0200 Subject: [PATCH] fix(docker): corrige les variables d'environnement buildkit pour les versions de docker --- templates/docker-18.yml | 6 ++++-- templates/docker-20.yml | 6 ++++-- templates/docker-23.yml | 6 ++++-- templates/docker-24.yml | 6 ++++-- 4 files changed, 16 insertions(+), 8 deletions(-) diff --git a/templates/docker-18.yml b/templates/docker-18.yml index 8697722..7567e8c 100644 --- a/templates/docker-18.yml +++ b/templates/docker-18.yml @@ -1,7 +1,9 @@ +variables: + DOCKER_DRIVER: overlay2 + DOCKER_BUILDKIT: 1 + .docker: image: docker:18 - environment: - DOCKER_BUILDKIT: 1 services: - name: docker:18-dind-rootless tags: diff --git a/templates/docker-20.yml b/templates/docker-20.yml index 11375ef..3ba8c5c 100644 --- a/templates/docker-20.yml +++ b/templates/docker-20.yml @@ -1,7 +1,9 @@ +variables: + DOCKER_DRIVER: overlay2 + DOCKER_BUILDKIT: 1 + .docker: image: docker:20 - environment: - DOCKER_BUILDKIT: 1 services: - name: docker:20-dind-rootless tags: diff --git a/templates/docker-23.yml b/templates/docker-23.yml index 595f0a9..f5c02d8 100644 --- a/templates/docker-23.yml +++ b/templates/docker-23.yml @@ -1,7 +1,9 @@ +variables: + DOCKER_DRIVER: overlay2 + DOCKER_BUILDKIT: 1 + .docker: image: docker:23 - environment: - DOCKER_BUILDKIT: 1 services: - name: docker:23-dind-rootless tags: diff --git a/templates/docker-24.yml b/templates/docker-24.yml index c81c32e..e2ef5ee 100644 --- a/templates/docker-24.yml +++ b/templates/docker-24.yml @@ -1,7 +1,9 @@ +variables: + DOCKER_DRIVER: overlay2 + DOCKER_BUILDKIT: 1 + .docker: image: docker:24 - environment: - DOCKER_BUILDKIT: 1 services: - name: docker:24-dind-rootless tags: -- GitLab