Skip to content

Commit

Permalink
Use next gen circleci python images in lieu of cloud builders
Browse files Browse the repository at this point in the history
The docker container provided by GCPs cloud-builders now recommends in its README the use of other docker containers, and is still running on Xenial. Since they are essentially swappable in place, here we use the containers that are maintained by the CI provider [2]

[1] https://github.com/GoogleCloudPlatform/cloud-builders
[2] https://circleci.com/developer/images/image/cimg/python
  • Loading branch information
emkll committed Jan 19, 2021
1 parent 7b6f780 commit 6660a1b
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -225,9 +225,9 @@ jobs:

admin-tests:
docker:
- image: gcr.io/cloud-builders/docker
- image: cimg/python:3.7
steps:
- run: apt-get install -y make jq
- run: sudo apt update && sudo apt-get install -y make jq
- checkout
- setup_remote_docker
- run:
Expand All @@ -239,9 +239,9 @@ jobs:
fetch-tor-debs:
docker:
- image: gcr.io/cloud-builders/docker
- image: cimg/python:3.7
steps:
- run: apt-get install -y make virtualenv python3-pip enchant jq
- run: sudo apt-get update && sudo apt-get install -y make virtualenv python3-pip enchant jq rsync
- checkout
- setup_remote_docker
- run:
Expand Down Expand Up @@ -369,12 +369,12 @@ jobs:

deb-tests:
docker:
- image: gcr.io/cloud-builders/docker
- image: cimg/python:3.7
environment:
LC_ALL: C.UTF-8
LANG: C.UTF-8
steps:
- run: apt-get install -y make virtualenv enchant jq python3-dev build-essential
- run: sudo apt-get update && sudo apt-get install -y make virtualenv enchant jq python3-dev build-essential rsync
- checkout
- setup_remote_docker
- run:
Expand All @@ -386,12 +386,12 @@ jobs:
deb-tests-focal:
docker:
- image: gcr.io/cloud-builders/docker
- image: cimg/python:3.7
environment:
LC_ALL: C.UTF-8
LANG: C.UTF-8
steps:
- run: apt-get install -y make virtualenv enchant jq python3-dev build-essential
- run: sudo apt-get update && sudo apt-get install -y make virtualenv enchant jq python3-dev build-essential rsync
- checkout
- setup_remote_docker
- run:
Expand Down

0 comments on commit 6660a1b

Please sign in to comment.