Skip to content

Commit b84d7e7

Browse files
techknowlogickjolheiser
authored and
GiteaBot
committed
Use buildkit for docker builds (go-gitea#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>
1 parent b301cb1 commit b84d7e7

File tree

1 file changed

+83
-18
lines changed

1 file changed

+83
-18
lines changed

‎.drone.yml

+83-18
Original file line numberDiff line numberDiff line change
@@ -1016,7 +1016,7 @@ steps:
10161016
- git fetch --tags --force
10171017

10181018
- name: publish
1019-
image: techknowlogick/drone-docker:latest
1019+
image: plugins/docker:latest
10201020
pull: always
10211021
settings:
10221022
auto_tag: true
@@ -1028,13 +1028,17 @@ steps:
10281028
from_secret: docker_password
10291029
username:
10301030
from_secret: docker_username
1031+
environment:
1032+
PLUGIN_MIRROR:
1033+
from_secret: plugin_mirror
1034+
DOCKER_BUILDKIT: 1
10311035
when:
10321036
event:
10331037
exclude:
10341038
- pull_request
10351039

10361040
- name: publish-rootless
1037-
image: techknowlogick/drone-docker:latest
1041+
image: plugins/docker:latest
10381042
settings:
10391043
dockerfile: Dockerfile.rootless
10401044
auto_tag: true
@@ -1046,6 +1050,10 @@ steps:
10461050
from_secret: docker_password
10471051
username:
10481052
from_secret: docker_username
1053+
environment:
1054+
PLUGIN_MIRROR:
1055+
from_secret: plugin_mirror
1056+
DOCKER_BUILDKIT: 1
10491057
when:
10501058
event:
10511059
exclude:
@@ -1080,7 +1088,7 @@ steps:
10801088
- git fetch --tags --force
10811089

10821090
- name: publish
1083-
image: techknowlogick/drone-docker:latest
1091+
image: plugins/docker:latest
10841092
pull: always
10851093
settings:
10861094
tags: ${DRONE_TAG##v}-linux-amd64
@@ -1091,13 +1099,17 @@ steps:
10911099
from_secret: docker_password
10921100
username:
10931101
from_secret: docker_username
1102+
environment:
1103+
PLUGIN_MIRROR:
1104+
from_secret: plugin_mirror
1105+
DOCKER_BUILDKIT: 1
10941106
when:
10951107
event:
10961108
exclude:
10971109
- pull_request
10981110

10991111
- name: publish-rootless
1100-
image: techknowlogick/drone-docker:latest
1112+
image: plugins/docker:latest
11011113
settings:
11021114
dockerfile: Dockerfile.rootless
11031115
tags: ${DRONE_TAG##v}-linux-amd64-rootless
@@ -1108,6 +1120,10 @@ steps:
11081120
from_secret: docker_password
11091121
username:
11101122
from_secret: docker_username
1123+
environment:
1124+
PLUGIN_MIRROR:
1125+
from_secret: plugin_mirror
1126+
DOCKER_BUILDKIT: 1
11111127
when:
11121128
event:
11131129
exclude:
@@ -1142,7 +1158,7 @@ steps:
11421158
- git fetch --tags --force
11431159

11441160
- name: publish
1145-
image: techknowlogick/drone-docker:latest
1161+
image: plugins/docker:latest
11461162
pull: always
11471163
settings:
11481164
auto_tag: false
@@ -1154,13 +1170,17 @@ steps:
11541170
from_secret: docker_password
11551171
username:
11561172
from_secret: docker_username
1173+
environment:
1174+
PLUGIN_MIRROR:
1175+
from_secret: plugin_mirror
1176+
DOCKER_BUILDKIT: 1
11571177
when:
11581178
event:
11591179
exclude:
11601180
- pull_request
11611181

11621182
- name: publish-rootless
1163-
image: techknowlogick/drone-docker:latest
1183+
image: plugins/docker:latest
11641184
settings:
11651185
dockerfile: Dockerfile.rootless
11661186
auto_tag: false
@@ -1172,6 +1192,10 @@ steps:
11721192
from_secret: docker_password
11731193
username:
11741194
from_secret: docker_username
1195+
environment:
1196+
PLUGIN_MIRROR:
1197+
from_secret: plugin_mirror
1198+
DOCKER_BUILDKIT: 1
11751199
when:
11761200
event:
11771201
exclude:
@@ -1205,7 +1229,7 @@ steps:
12051229
- git fetch --tags --force
12061230

12071231
- name: publish
1208-
image: techknowlogick/drone-docker:latest
1232+
image: plugins/docker:latest
12091233
pull: always
12101234
settings:
12111235
auto_tag: false
@@ -1217,13 +1241,17 @@ steps:
12171241
from_secret: docker_password
12181242
username:
12191243
from_secret: docker_username
1244+
environment:
1245+
PLUGIN_MIRROR:
1246+
from_secret: plugin_mirror
1247+
DOCKER_BUILDKIT: 1
12201248
when:
12211249
event:
12221250
exclude:
12231251
- pull_request
12241252

12251253
- name: publish-rootless
1226-
image: techknowlogick/drone-docker:latest
1254+
image: plugins/docker:latest
12271255
settings:
12281256
dockerfile: Dockerfile.rootless
12291257
auto_tag: false
@@ -1235,6 +1263,10 @@ steps:
12351263
from_secret: docker_password
12361264
username:
12371265
from_secret: docker_username
1266+
environment:
1267+
PLUGIN_MIRROR:
1268+
from_secret: plugin_mirror
1269+
DOCKER_BUILDKIT: 1
12381270
when:
12391271
event:
12401272
exclude:
@@ -1243,7 +1275,7 @@ steps:
12431275
---
12441276
kind: pipeline
12451277
type: docker
1246-
name: docker-linux-arm64-dry-run
1278+
name: docker-linux-amd64-dry-run
12471279

12481280
platform:
12491281
os: linux
@@ -1261,7 +1293,7 @@ trigger:
12611293

12621294
steps:
12631295
- name: dryrun
1264-
image: techknowlogick/drone-docker:latest
1296+
image: plugins/docker:latest
12651297
pull: always
12661298
settings:
12671299
dry_run: true
@@ -1272,6 +1304,7 @@ steps:
12721304
environment:
12731305
PLUGIN_MIRROR:
12741306
from_secret: plugin_mirror
1307+
DOCKER_BUILDKIT: 1
12751308
when:
12761309
event:
12771310
- pull_request
@@ -1308,7 +1341,7 @@ steps:
13081341
- git fetch --tags --force
13091342

13101343
- name: publish
1311-
image: techknowlogick/drone-docker:latest
1344+
image: plugins/docker:latest
13121345
pull: always
13131346
settings:
13141347
auto_tag: true
@@ -1320,13 +1353,17 @@ steps:
13201353
from_secret: docker_password
13211354
username:
13221355
from_secret: docker_username
1356+
environment:
1357+
PLUGIN_MIRROR:
1358+
from_secret: plugin_mirror
1359+
DOCKER_BUILDKIT: 1
13231360
when:
13241361
event:
13251362
exclude:
13261363
- pull_request
13271364

13281365
- name: publish-rootless
1329-
image: techknowlogick/drone-docker:latest
1366+
image: plugins/docker:latest
13301367
settings:
13311368
dockerfile: Dockerfile.rootless
13321369
auto_tag: true
@@ -1338,6 +1375,10 @@ steps:
13381375
from_secret: docker_password
13391376
username:
13401377
from_secret: docker_username
1378+
environment:
1379+
PLUGIN_MIRROR:
1380+
from_secret: plugin_mirror
1381+
DOCKER_BUILDKIT: 1
13411382
when:
13421383
event:
13431384
exclude:
@@ -1372,7 +1413,7 @@ steps:
13721413
- git fetch --tags --force
13731414

13741415
- name: publish
1375-
image: techknowlogick/drone-docker:latest
1416+
image: plugins/docker:latest
13761417
pull: always
13771418
settings:
13781419
tags: ${DRONE_TAG##v}-linux-arm64
@@ -1383,13 +1424,17 @@ steps:
13831424
from_secret: docker_password
13841425
username:
13851426
from_secret: docker_username
1427+
environment:
1428+
PLUGIN_MIRROR:
1429+
from_secret: plugin_mirror
1430+
DOCKER_BUILDKIT: 1
13861431
when:
13871432
event:
13881433
exclude:
13891434
- pull_request
13901435

13911436
- name: publish-rootless
1392-
image: techknowlogick/drone-docker:latest
1437+
image: plugins/docker:latest
13931438
settings:
13941439
dockerfile: Dockerfile.rootless
13951440
tags: ${DRONE_TAG##v}-linux-arm64-rootless
@@ -1400,6 +1445,10 @@ steps:
14001445
from_secret: docker_password
14011446
username:
14021447
from_secret: docker_username
1448+
environment:
1449+
PLUGIN_MIRROR:
1450+
from_secret: plugin_mirror
1451+
DOCKER_BUILDKIT: 1
14031452
when:
14041453
event:
14051454
exclude:
@@ -1434,7 +1483,7 @@ steps:
14341483
- git fetch --tags --force
14351484

14361485
- name: publish
1437-
image: techknowlogick/drone-docker:latest
1486+
image: plugins/docker:latest
14381487
pull: always
14391488
settings:
14401489
auto_tag: false
@@ -1446,13 +1495,17 @@ steps:
14461495
from_secret: docker_password
14471496
username:
14481497
from_secret: docker_username
1498+
environment:
1499+
PLUGIN_MIRROR:
1500+
from_secret: plugin_mirror
1501+
DOCKER_BUILDKIT: 1
14491502
when:
14501503
event:
14511504
exclude:
14521505
- pull_request
14531506

14541507
- name: publish-rootless
1455-
image: techknowlogick/drone-docker:latest
1508+
image: plugins/docker:latest
14561509
settings:
14571510
dockerfile: Dockerfile.rootless
14581511
auto_tag: false
@@ -1464,6 +1517,10 @@ steps:
14641517
from_secret: docker_password
14651518
username:
14661519
from_secret: docker_username
1520+
environment:
1521+
PLUGIN_MIRROR:
1522+
from_secret: plugin_mirror
1523+
DOCKER_BUILDKIT: 1
14671524
when:
14681525
event:
14691526
exclude:
@@ -1497,7 +1554,7 @@ steps:
14971554
- git fetch --tags --force
14981555

14991556
- name: publish
1500-
image: techknowlogick/drone-docker:latest
1557+
image: plugins/docker:latest
15011558
pull: always
15021559
settings:
15031560
auto_tag: false
@@ -1509,13 +1566,17 @@ steps:
15091566
from_secret: docker_password
15101567
username:
15111568
from_secret: docker_username
1569+
environment:
1570+
PLUGIN_MIRROR:
1571+
from_secret: plugin_mirror
1572+
DOCKER_BUILDKIT: 1
15121573
when:
15131574
event:
15141575
exclude:
15151576
- pull_request
15161577

15171578
- name: publish-rootless
1518-
image: techknowlogick/drone-docker:latest
1579+
image: plugins/docker:latest
15191580
settings:
15201581
dockerfile: Dockerfile.rootless
15211582
auto_tag: false
@@ -1527,6 +1588,10 @@ steps:
15271588
from_secret: docker_password
15281589
username:
15291590
from_secret: docker_username
1591+
environment:
1592+
PLUGIN_MIRROR:
1593+
from_secret: plugin_mirror
1594+
DOCKER_BUILDKIT: 1
15301595
when:
15311596
event:
15321597
exclude:

0 commit comments

Comments
 (0)