Skip to content

Commit

Permalink
Fix dockerignore (#52)
Browse files Browse the repository at this point in the history
  • Loading branch information
hikimochi authored and nk-ty committed Dec 4, 2019
1 parent 56423b0 commit 0939f13
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 3 deletions.
6 changes: 3 additions & 3 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ jobs:
steps:
- checkout
- restore_cache:
key: docker-{{ checksum ".circleci/config.yml" }}-{{ checksum "docker-compose.system-test.yml" }}-{{ checksum "Dockerfile.system-test" }}-{{ checksum "bucky-core.gemspec" }}
key: docker-{{ checksum ".circleci/config.yml" }}-{{ checksum "docker-compose.system-test.yml" }}-{{ checksum "Dockerfile.system-test" }}-{{ checksum "bucky-core.gemspec" }}-{{ checksum ".dockerignore" }}
- run:
command: |
if [ ! -f ~/caches/images.tar ]; then
Expand All @@ -14,15 +14,15 @@ jobs:
docker save $(docker images | awk 'NR>=2 && ! /^<none>/{print $1}') -o ~/caches/images.tar
fi
- save_cache:
key: docker-{{ checksum ".circleci/config.yml" }}-{{ checksum "docker-compose.system-test.yml" }}-{{ checksum "Dockerfile.system-test" }}-{{ checksum "bucky-core.gemspec" }}
key: docker-{{ checksum ".circleci/config.yml" }}-{{ checksum "docker-compose.system-test.yml" }}-{{ checksum "Dockerfile.system-test" }}-{{ checksum "bucky-core.gemspec" }}-{{ checksum ".dockerignore" }}
paths: ~/caches/images.tar
system_test:
machine: true
parallelism: 2
steps:
- checkout
- restore_cache:
key: docker-{{ checksum ".circleci/config.yml" }}-{{ checksum "docker-compose.system-test.yml" }}-{{ checksum "Dockerfile.system-test" }}-{{ checksum "bucky-core.gemspec" }}
key: docker-{{ checksum ".circleci/config.yml" }}-{{ checksum "docker-compose.system-test.yml" }}-{{ checksum "Dockerfile.system-test" }}-{{ checksum "bucky-core.gemspec" }}-{{ checksum ".dockerignore" }}
- run:
command: docker load -q -i ~/caches/images.tar
- run:
Expand Down
20 changes: 20 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,23 @@
# Git
.gitignore

# CI
.codeclimate.yml
.circleci
.rubocop*

# Docker
# docker-compose*

# Test
spec/
.rspec
system-testing/

# Log
*.log

# Others
.DS_Store
.bundle
.vscode
Expand All @@ -9,3 +27,5 @@ coverage/
doc
tags
tmp
template/
.sample/

0 comments on commit 0939f13

Please sign in to comment.