Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix #121: Remove use of ci-docker bases #125

Merged
merged 4 commits into from
Aug 3, 2022
Merged

Fix #121: Remove use of ci-docker bases #125

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
43deee4
Use rust:latest
leplatrem Jul 15, 2022
f4bebcb
Use cimg/base:current for docker steps
leplatrem Jul 15, 2022
e502738
Do not set working directory explicitly
leplatrem Jul 15, 2022
f72bc13
Save Docker image in /tmp
leplatrem Jul 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 13 additions & 8 deletions .circleci/config.yml
View file
Open in desktop
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