Skip to content

Commit 0ac878a

Browse files
committed
Use CircleCI machine platform
1 parent a6c25df commit 0ac878a

File tree

1 file changed

+12
-7
lines changed

1 file changed

+12
-7
lines changed

.circleci/config.yml

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,15 @@ commands:
1717
description: "Ensure built assets are up to date"
1818
steps:
1919
- checkout
20-
- setup_remote_docker
20+
# - setup_remote_docker
2121
# - run: npm ci
22-
- run: docker build -t sphinx_rtd_theme:latest .
23-
- run: docker run --cidfile=.container_id --mount type=bind,source="${CIRCLE_WORKING_DIRECTORY}/src",target=/project/src,readonly sphinx_rtd_theme:latest
24-
- run: docker cp "$(cat .container_id):/project/sphinx_rtd_theme" .
25-
- run: docker cp "$(cat .container_id):/project/package-lock.json" .
22+
- run: make docker-images
23+
- run: make docker-run
24+
- run: make docker-copy-assets
25+
# - run: docker build -t sphinx_rtd_theme:latest .
26+
# - run: docker run --cidfile=.container_id --mount type=bind,source="${CIRCLE_WORKING_DIRECTORY}/src",target=/project/src,readonly sphinx_rtd_theme:latest
27+
# - run: docker cp "$(cat .container_id):/project/sphinx_rtd_theme" .
28+
# - run: docker cp "$(cat .container_id):/project/package-lock.json" .
2629
- run:
2730
name: Ensure built assets are up to date
2831
command: |
@@ -35,8 +38,10 @@ commands:
3538
3639
jobs:
3740
build:
38-
docker:
39-
- image: docker:17.05.0-ce-git
41+
machine: # executor type
42+
image: ubuntu-2004:202010-01 # # recommended linux image - includes Ubuntu 20.04, docker 19.03.13, docker-compose 1.27.4
43+
# docker:
44+
# - image: docker:17.05.0-ce-git
4045
steps:
4146
- run-build: {}
4247
py27:

0 commit comments

Comments
 (0)