Skip to content

Commit

Permalink
Merge pull request #125 from mozilla/remove-ci-docker-bases
Browse files Browse the repository at this point in the history
Fix #121: Remove use of ci-docker bases
  • Loading branch information
leplatrem authored Aug 3, 2022
2 parents ca26217 + f72bc13 commit ea2fa80
Showing 1 changed file with 13 additions and 8 deletions.
21 changes: 13 additions & 8 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ version: 2.1
jobs:
test:
docker:
- image: mozilla/cidockerbases:rust-2022-04-23
- image: rust:latest
steps:
- checkout
- download-geolite
Expand All @@ -24,9 +24,15 @@ jobs:

lint:
docker:
- image: mozilla/cidockerbases:rust-2022-04-23
- image: rust:latest
steps:
- checkout
- run:
name: Setup Rust
command: |
rustup component add rustfmt
rustup component add clippy
cargo install cargo-audit
- run:
name: Rustfmt
command: cargo fmt -- --check
Expand All @@ -42,8 +48,7 @@ jobs:
build:
docker:
- image: mozilla/cidockerbases:docker-2022-04-23
working_directory: /dockerflow
- image: cimg/base:current
steps:
- checkout
- setup_remote_docker
Expand All @@ -67,22 +72,22 @@ jobs:
# required since Workflows do not have the same remote docker instance.
- run:
name: docker save app:build
command: mkdir -p /cache; docker save -o /cache/docker.tar "app:build"
command: mkdir -p /tmp; docker save -o /tmp/docker.tar "app:build"
- save_cache:
key: v1-{{ .Branch }}-{{epoch}}
paths:
- /cache/docker.tar
- /tmp/docker.tar

publish:
docker:
- image: mozilla/cidockerbases:docker-2022-04-23
- image: cimg/base:current
steps:
- setup_remote_docker
- restore_cache:
key: v1-{{.Branch}}
- run:
name: Restore Docker image cache
command: docker load -i /cache/docker.tar
command: docker load -i /tmp/docker.tar

- run:
name: Deploy to Dockerhub
Expand Down

0 comments on commit ea2fa80

Please sign in to comment.