Skip to content

Commit bcdb675

Browse files
authored
Use buildkit for harness builds (#582)
1 parent 379996a commit bcdb675

File tree

4 files changed

+11
-2
lines changed

4 files changed

+11
-2
lines changed

Diff for: Jenkinsfile

+2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
pipeline {
22
agent none
33
environment {
4+
COMPOSE_DOCKER_CLI_BUILD = 1
5+
DOCKER_BUILDKIT = 1
46
MY127WS_KEY = credentials('base-my127ws-key-20190523')
57
}
68
options {

Diff for: src/_base/application/overlay/Jenkinsfile.twig

+2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
pipeline {
22
agent { label "my127ws" }
33
environment {
4+
COMPOSE_DOCKER_CLI_BUILD = {{ @('jenkins.docker.buildkit.enabled') ? '1' : '0' }}
5+
DOCKER_BUILDKIT = {{ @('jenkins.docker.buildkit.enabled') ? '1' : '0' }}
46
MY127WS_KEY = credentials('{{ @('jenkins.credentials.my127ws_key') }}')
57
MY127WS_ENV = "pipeline"
68
}

Diff for: src/_base/harness/attributes/common.yml

+5-2
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,13 @@ attributes.default:
2323
mutagen: yes
2424

2525
jenkins:
26-
tests:
27-
isolated: true
2826
credentials:
2927
my127ws_key: = @('workspace.name') ~ '-my127ws-key'
28+
docker:
29+
buildkit:
30+
enabled: true
31+
tests:
32+
isolated: true
3033

3134
pipeline:
3235
base:

Diff for: src/drupal8/application/overlay/Jenkinsfile.twig

+2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
pipeline {
22
agent { label "my127ws" }
33
environment {
4+
COMPOSE_DOCKER_CLI_BUILD = {{ @('jenkins.docker.buildkit.enabled') ? '1' : '0' }}
5+
DOCKER_BUILDKIT = {{ @('jenkins.docker.buildkit.enabled') ? '1' : '0' }}
46
MY127WS_KEY = credentials('{{ @('jenkins.credentials.my127ws_key') }}')
57
MY127WS_ENV = "pipeline"
68
}

0 commit comments

Comments
 (0)