Skip to content

Commit 3da40c0

Browse files
authored
Fix Circle CI build job (#2272)
1 parent 123d6b0 commit 3da40c0

File tree

4 files changed

+13
-8
lines changed

4 files changed

+13
-8
lines changed

.circleci/config.yml

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -114,13 +114,20 @@ jobs:
114114

115115
build-and-deploy:
116116
docker:
117-
- image: circleci/python:3.6
117+
- image: cimg/python:3.6
118+
environment:
119+
DOCKER_CLI_EXPERIMENTAL: enabled
120+
DOCKER_CONTEXT: default
118121
steps:
119122
- setup_remote_docker
120123
- checkout
121124
- install-go
122-
- run: docker buildx create --name builder --platform linux/amd64,linux/arm64 --use && docker buildx inspect --bootstrap
123-
- run: sudo pip install awscli
125+
- run:
126+
name: Configure Docker Buildx
127+
command: |
128+
docker context create custom-context --default-stack-orchestrator swarm --docker "host=$DOCKER_HOST,ca=$DOCKER_CERT_PATH/ca.pem,cert=$DOCKER_CERT_PATH/cert.pem,key=$DOCKER_CERT_PATH/key.pem"
129+
docker buildx create --name builder --platform linux/amd64,linux/arm64 --use custom-context && docker buildx inspect --bootstrap
130+
- run: pip install awscli
124131
- run: make ci-build-cli
125132
- return-if-not-deployed-branch
126133
- run: make ci-build-and-upload-cli
@@ -135,7 +142,7 @@ jobs:
135142

136143
e2e-tests:
137144
docker:
138-
- image: circleci/python:3.6
145+
- image: cimg/python:3.6
139146
environment:
140147
CORTEX_TEST_BATCH_S3_PATH: s3://cortex-nightly-artifacts/test/jobs
141148
steps:

build/build-image.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,4 @@ platforms=$2
2727
if [ "$image" == "inferentia" ]; then
2828
aws ecr get-login-password --region us-west-2 | docker login --username AWS --password-stdin 790709498068.dkr.ecr.us-west-2.amazonaws.com
2929
fi
30-
docker buildx build $ROOT -f $ROOT/images/$image/Dockerfile -t quay.io/cortexlabs/${image}:${CORTEX_VERSION} -t cortexlabs/${image}:${CORTEX_VERSION} --platform $platforms
30+
docker buildx build $ROOT --progress plain -f $ROOT/images/$image/Dockerfile -t quay.io/cortexlabs/${image}:${CORTEX_VERSION} -t cortexlabs/${image}:${CORTEX_VERSION} --platform $platforms

build/push-image.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,4 @@ image=$2
2626
platforms=$3
2727

2828
echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
29-
docker buildx build $ROOT -f $ROOT/images/$image/Dockerfile $host/cortexlabs/${image}:${CORTEX_VERSION} --platform $platforms --push
29+
docker buildx build $ROOT --progress plain -f $ROOT/images/$image/Dockerfile -t $host/cortexlabs/${image}:${CORTEX_VERSION} --platform $platforms --push

test/e2e/setup.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,6 @@
3030
license="Apache License 2.0",
3131
python_requires=">=3.6",
3232
install_requires=[
33-
"grpcio==1.36.0",
34-
"grpcio-tools==1.36.0",
3533
"requests==2.24.0",
3634
"jsonschema==3.2.0",
3735
"pytest==6.1.*",

0 commit comments

Comments
 (0)