From ab5bcdf98f44cabc8c2a0ffb764b7c750023baef Mon Sep 17 00:00:00 2001
From: techknowlogick <techknowlogick@gitea.io>
Date: Sat, 11 Mar 2023 16:08:56 -0500
Subject: [PATCH] Use buildkit for docker builds (#23415)
This switches Docker builds to use build kit which is less prone to
error than legacy docker-in-docker building. It also switches back to
using the upstream docker image again now that it has been updated to a
version that supports alpine 3.14+
Co-authored-by: John Olheiser <john.olheiser@gmail.com>
---
.drone.yml | 101 +++++++++++++++++++++++++++++++++++++++++++----------
1 file changed, 83 insertions(+), 18 deletions(-)
diff --git a/.drone.yml b/.drone.yml
index 0e1d799834..1181b809b0 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -1206,7 +1206,7 @@ steps:
- git fetch --tags --force
- name: publish
- image: techknowlogick/drone-docker:latest
+ image: plugins/docker:latest
pull: always
settings:
auto_tag: true
@@ -1218,13 +1218,17 @@ steps:
from_secret: docker_password
username:
from_secret: docker_username
+ environment:
+ PLUGIN_MIRROR:
+ from_secret: plugin_mirror
+ DOCKER_BUILDKIT: 1
when:
event:
exclude:
- pull_request
- name: publish-rootless
- image: techknowlogick/drone-docker:latest
+ image: plugins/docker:latest
settings:
dockerfile: Dockerfile.rootless
auto_tag: true
@@ -1236,6 +1240,10 @@ steps:
from_secret: docker_password
username:
from_secret: docker_username
+ environment:
+ PLUGIN_MIRROR:
+ from_secret: plugin_mirror
+ DOCKER_BUILDKIT: 1
when:
event:
exclude:
@@ -1276,7 +1284,7 @@ steps:
- git fetch --tags --force
- name: publish
- image: techknowlogick/drone-docker:latest
+ image: plugins/docker:latest
pull: always
settings:
tags: ${DRONE_TAG##v}-linux-amd64
@@ -1287,13 +1295,17 @@ steps:
from_secret: docker_password
username:
from_secret: docker_username
+ environment:
+ PLUGIN_MIRROR:
+ from_secret: plugin_mirror
+ DOCKER_BUILDKIT: 1
when:
event:
exclude:
- pull_request
- name: publish-rootless
- image: techknowlogick/drone-docker:latest
+ image: plugins/docker:latest
settings:
dockerfile: Dockerfile.rootless
tags: ${DRONE_TAG##v}-linux-amd64-rootless
@@ -1304,6 +1316,10 @@ steps:
from_secret: docker_password
username:
from_secret: docker_username
+ environment:
+ PLUGIN_MIRROR:
+ from_secret: plugin_mirror
+ DOCKER_BUILDKIT: 1
when:
event:
exclude:
@@ -1341,7 +1357,7 @@ steps:
- git fetch --tags --force
- name: publish
- image: techknowlogick/drone-docker:latest
+ image: plugins/docker:latest
pull: always
settings:
auto_tag: false
@@ -1353,13 +1369,17 @@ steps:
from_secret: docker_password
username:
from_secret: docker_username
+ environment:
+ PLUGIN_MIRROR:
+ from_secret: plugin_mirror
+ DOCKER_BUILDKIT: 1
when:
event:
exclude:
- pull_request
- name: publish-rootless
- image: techknowlogick/drone-docker:latest
+ image: plugins/docker:latest
settings:
dockerfile: Dockerfile.rootless
auto_tag: false
@@ -1371,6 +1391,10 @@ steps:
from_secret: docker_password
username:
from_secret: docker_username
+ environment:
+ PLUGIN_MIRROR:
+ from_secret: plugin_mirror
+ DOCKER_BUILDKIT: 1
when:
event:
exclude:
@@ -1407,7 +1431,7 @@ steps:
- git fetch --tags --force
- name: publish
- image: techknowlogick/drone-docker:latest
+ image: plugins/docker:latest
pull: always
settings:
auto_tag: false
@@ -1419,13 +1443,17 @@ steps:
from_secret: docker_password
username:
from_secret: docker_username
+ environment:
+ PLUGIN_MIRROR:
+ from_secret: plugin_mirror
+ DOCKER_BUILDKIT: 1
when:
event:
exclude:
- pull_request
- name: publish-rootless
- image: techknowlogick/drone-docker:latest
+ image: plugins/docker:latest
settings:
dockerfile: Dockerfile.rootless
auto_tag: false
@@ -1437,6 +1465,10 @@ steps:
from_secret: docker_password
username:
from_secret: docker_username
+ environment:
+ PLUGIN_MIRROR:
+ from_secret: plugin_mirror
+ DOCKER_BUILDKIT: 1
when:
event:
exclude:
@@ -1445,7 +1477,7 @@ steps:
---
kind: pipeline
type: docker
-name: docker-linux-arm64-dry-run
+name: docker-linux-amd64-dry-run
platform:
os: linux
@@ -1463,7 +1495,7 @@ trigger:
steps:
- name: dryrun
- image: techknowlogick/drone-docker:latest
+ image: plugins/docker:latest
pull: always
settings:
dry_run: true
@@ -1474,6 +1506,7 @@ steps:
environment:
PLUGIN_MIRROR:
from_secret: plugin_mirror
+ DOCKER_BUILDKIT: 1
when:
event:
- pull_request
@@ -1516,7 +1549,7 @@ steps:
- git fetch --tags --force
- name: publish
- image: techknowlogick/drone-docker:latest
+ image: plugins/docker:latest
pull: always
settings:
auto_tag: true
@@ -1528,13 +1561,17 @@ steps:
from_secret: docker_password
username:
from_secret: docker_username
+ environment:
+ PLUGIN_MIRROR:
+ from_secret: plugin_mirror
+ DOCKER_BUILDKIT: 1
when:
event:
exclude:
- pull_request
- name: publish-rootless
- image: techknowlogick/drone-docker:latest
+ image: plugins/docker:latest
settings:
dockerfile: Dockerfile.rootless
auto_tag: true
@@ -1546,6 +1583,10 @@ steps:
from_secret: docker_password
username:
from_secret: docker_username
+ environment:
+ PLUGIN_MIRROR:
+ from_secret: plugin_mirror
+ DOCKER_BUILDKIT: 1
when:
event:
exclude:
@@ -1586,7 +1627,7 @@ steps:
- git fetch --tags --force
- name: publish
- image: techknowlogick/drone-docker:latest
+ image: plugins/docker:latest
pull: always
settings:
tags: ${DRONE_TAG##v}-linux-arm64
@@ -1597,13 +1638,17 @@ steps:
from_secret: docker_password
username:
from_secret: docker_username
+ environment:
+ PLUGIN_MIRROR:
+ from_secret: plugin_mirror
+ DOCKER_BUILDKIT: 1
when:
event:
exclude:
- pull_request
- name: publish-rootless
- image: techknowlogick/drone-docker:latest
+ image: plugins/docker:latest
settings:
dockerfile: Dockerfile.rootless
tags: ${DRONE_TAG##v}-linux-arm64-rootless
@@ -1614,6 +1659,10 @@ steps:
from_secret: docker_password
username:
from_secret: docker_username
+ environment:
+ PLUGIN_MIRROR:
+ from_secret: plugin_mirror
+ DOCKER_BUILDKIT: 1
when:
event:
exclude:
@@ -1654,7 +1703,7 @@ steps:
- git fetch --tags --force
- name: publish
- image: techknowlogick/drone-docker:latest
+ image: plugins/docker:latest
pull: always
settings:
auto_tag: false
@@ -1666,13 +1715,17 @@ steps:
from_secret: docker_password
username:
from_secret: docker_username
+ environment:
+ PLUGIN_MIRROR:
+ from_secret: plugin_mirror
+ DOCKER_BUILDKIT: 1
when:
event:
exclude:
- pull_request
- name: publish-rootless
- image: techknowlogick/drone-docker:latest
+ image: plugins/docker:latest
settings:
dockerfile: Dockerfile.rootless
auto_tag: false
@@ -1684,6 +1737,10 @@ steps:
from_secret: docker_password
username:
from_secret: docker_username
+ environment:
+ PLUGIN_MIRROR:
+ from_secret: plugin_mirror
+ DOCKER_BUILDKIT: 1
when:
event:
exclude:
@@ -1720,7 +1777,7 @@ steps:
- git fetch --tags --force
- name: publish
- image: techknowlogick/drone-docker:latest
+ image: plugins/docker:latest
pull: always
settings:
auto_tag: false
@@ -1732,13 +1789,17 @@ steps:
from_secret: docker_password
username:
from_secret: docker_username
+ environment:
+ PLUGIN_MIRROR:
+ from_secret: plugin_mirror
+ DOCKER_BUILDKIT: 1
when:
event:
exclude:
- pull_request
- name: publish-rootless
- image: techknowlogick/drone-docker:latest
+ image: plugins/docker:latest
settings:
dockerfile: Dockerfile.rootless
auto_tag: false
@@ -1750,6 +1811,10 @@ steps:
from_secret: docker_password
username:
from_secret: docker_username
+ environment:
+ PLUGIN_MIRROR:
+ from_secret: plugin_mirror
+ DOCKER_BUILDKIT: 1
when:
event:
exclude: