Skip to content

Commit

Permalink
Merge pull request #3049 from th-2021/circleci-update
Browse files Browse the repository at this point in the history
Circleci update
  • Loading branch information
sachilles authored Jan 17, 2025
2 parents 76dad78 + 1b0604a commit 4f977fe
Showing 1 changed file with 12 additions and 4 deletions.
16 changes: 12 additions & 4 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ version: 2.1

orbs:
shellcheck: circleci/[email protected]
docker: circleci/docker@2.5.0
docker: circleci/docker@2.8.1
go: circleci/[email protected]

commands:
Expand Down Expand Up @@ -50,6 +50,11 @@ commands:
description: |
No output timeout for build step
type: string
use-buildkit:
default: false
description: |
Use buildkit to build the image. Available on Docker >= 18.09.0 https://docs.docker.com/develop/develop-images/build_enhancements/
type: boolean
steps:
- when:
condition: <<parameters.cache_from>>
Expand All @@ -76,7 +81,7 @@ commands:
done
done
docker build
docker buildx build
<<#parameters.extra_build_args>><<parameters.extra_build_args>><</parameters.extra_build_args>>
\
--cache-from <<parameters.cache_from>> \
Expand All @@ -102,7 +107,7 @@ commands:
done
done
docker build
docker buildx build
<<#parameters.extra_build_args>><<parameters.extra_build_args>><</parameters.extra_build_args>>
\
-f <<parameters.path>>/<<parameters.dockerfile>> \
Expand Down Expand Up @@ -198,7 +203,9 @@ commands:
jobs:
build:
executor: docker/machine
machine:
image: ubuntu-2404:edge
resource_class: large
steps:
- checkout
- docker-build:
Expand All @@ -208,6 +215,7 @@ jobs:
cache_from: docker.io/sameersbn/gitlab:latest
extra_build_args: '--build-arg VCS_REF=${CIRCLE_TAG:-${CIRCLE_SHA1}} --build-arg BUILD_DATE="$(date +"%Y-%m-%d %H:%M:%S%:z")"'
no_output_timeout: 45m
use-buildkit: true
- docker-save:
registry: docker.io,quay.io
image: sameersbn/gitlab
Expand Down

0 comments on commit 4f977fe

Please sign in to comment.