Skip to content

Commit 40d8e97

Browse files
committed
Use machine executor to build Docker image
1 parent aa45e6b commit 40d8e97

File tree

1 file changed

+17
-5
lines changed

1 file changed

+17
-5
lines changed

.circleci/config.yml

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,10 @@ executors:
2020
working_directory: ~/marp-cli
2121

2222
docker:
23-
docker:
24-
- image: docker:git
23+
machine: true
2524
working_directory: ~/marp-cli
25+
environment:
26+
DOCKER_BUILDKIT: 1
2627

2728
commands:
2829
install:
@@ -108,11 +109,21 @@ commands:
108109
pass:
109110
type: env_var_name
110111
default: DOCKER_PASS
112+
machine:
113+
type: boolean
114+
default: false
111115
steps:
112116
- checkout
113117

114-
- setup_remote_docker:
115-
version: '20.10.2'
118+
- unless:
119+
condition: << parameters.machine >>
120+
steps:
121+
- setup_remote_docker:
122+
version: '20.10.2'
123+
124+
- run:
125+
name: Login to Docker Hub
126+
command: docker login -u ${<< parameters.user >>} -p ${<< parameters.pass >>}
116127

117128
- run:
118129
name: Install Docker buildx
@@ -130,7 +141,6 @@ commands:
130141
- run:
131142
name: Build Docker image and push to Docker Hub
132143
command: |
133-
docker login -u ${<< parameters.user >>} -p ${<< parameters.pass >>}
134144
docker context create builder
135145
docker buildx create --use builder
136146
docker buildx build --no-cache --platform linux/amd64,linux/arm64 --push -t marpteam/marp-cli:<< parameters.tag >> .
@@ -171,12 +181,14 @@ jobs:
171181
executor: docker
172182
steps:
173183
- docker:
184+
machine: true
174185
tag: latest
175186

176187
docker-image-tag:
177188
executor: docker
178189
steps:
179190
- docker:
191+
machine: true
180192
tag: $CIRCLE_TAG
181193

182194
workflows:

0 commit comments

Comments
 (0)