Skip to content

Commit 4f977fe

Browse files
authored
Merge pull request #3049 from th-2021/circleci-update
Circleci update
2 parents 76dad78 + 1b0604a commit 4f977fe

File tree

1 file changed

+12
-4
lines changed

1 file changed

+12
-4
lines changed

.circleci/config.yml

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ version: 2.1
22

33
orbs:
44
shellcheck: circleci/[email protected]
5-
docker: circleci/docker@2.5.0
5+
docker: circleci/docker@2.8.1
66
go: circleci/[email protected]
77

88
commands:
@@ -50,6 +50,11 @@ commands:
5050
description: |
5151
No output timeout for build step
5252
type: string
53+
use-buildkit:
54+
default: false
55+
description: |
56+
Use buildkit to build the image. Available on Docker >= 18.09.0 https://docs.docker.com/develop/develop-images/build_enhancements/
57+
type: boolean
5358
steps:
5459
- when:
5560
condition: <<parameters.cache_from>>
@@ -76,7 +81,7 @@ commands:
7681
done
7782
done
7883
79-
docker build
84+
docker buildx build
8085
<<#parameters.extra_build_args>><<parameters.extra_build_args>><</parameters.extra_build_args>>
8186
\
8287
--cache-from <<parameters.cache_from>> \
@@ -102,7 +107,7 @@ commands:
102107
done
103108
done
104109
105-
docker build
110+
docker buildx build
106111
<<#parameters.extra_build_args>><<parameters.extra_build_args>><</parameters.extra_build_args>>
107112
\
108113
-f <<parameters.path>>/<<parameters.dockerfile>> \
@@ -198,7 +203,9 @@ commands:
198203
199204
jobs:
200205
build:
201-
executor: docker/machine
206+
machine:
207+
image: ubuntu-2404:edge
208+
resource_class: large
202209
steps:
203210
- checkout
204211
- docker-build:
@@ -208,6 +215,7 @@ jobs:
208215
cache_from: docker.io/sameersbn/gitlab:latest
209216
extra_build_args: '--build-arg VCS_REF=${CIRCLE_TAG:-${CIRCLE_SHA1}} --build-arg BUILD_DATE="$(date +"%Y-%m-%d %H:%M:%S%:z")"'
210217
no_output_timeout: 45m
218+
use-buildkit: true
211219
- docker-save:
212220
registry: docker.io,quay.io
213221
image: sameersbn/gitlab

0 commit comments

Comments
 (0)