|
8 | 8 | - checkout:
|
9 | 9 | path: /home/circleci/nipype
|
10 | 10 | - run:
|
11 |
| - name: Prune base Dockerfile in preparation for cache check |
12 |
| - working_directory: /home/circleci/nipype/docker |
| 11 | + name: Generate and prune base Dockerfile in preparation for cache check |
| 12 | + working_directory: /home/circleci/nipype |
13 | 13 | command: |
|
14 | 14 | mkdir -p /tmp/docker
|
| 15 | + make gen-base-dockerfile |
| 16 | +
|
15 | 17 | # Use the sha256 sum of the pruned Dockerfile as the cache key.
|
16 |
| - ash prune_dockerfile.sh Dockerfile.base > /tmp/docker/Dockerfile.base-pruned |
| 18 | + ash docker/prune_dockerfile.sh docker/Dockerfile.base > /tmp/docker/Dockerfile.base-pruned |
17 | 19 | - restore_cache:
|
18 | 20 | key: dockerfile-cache-v1-master-{{ checksum "/tmp/docker/Dockerfile.base-pruned" }}
|
19 | 21 | - run:
|
|
43 | 45 | - attach_workspace:
|
44 | 46 | at: /tmp
|
45 | 47 | - run:
|
46 |
| - name: Get test dependencies |
| 48 | + name: Get test dependencies and generate Dockerfiles |
47 | 49 | command: |
|
48 | 50 | pip install --no-cache-dir codecov
|
| 51 | + make gen-dockerfiles |
49 | 52 | - run:
|
50 | 53 | name: Modify Nipype version if necessary
|
51 | 54 | working_directory: /home/circleci/nipype
|
@@ -171,12 +174,14 @@ jobs:
|
171 | 174 | docker push nipype/nipype:py36
|
172 | 175 | docker push nipype/nipype:py27
|
173 | 176 | - run:
|
174 |
| - name: Prune base Dockerfile to update cache |
175 |
| - working_directory: /home/circleci/nipype/docker |
| 177 | + name: Generate and prune base Dockerfile to update cache |
| 178 | + working_directory: /home/circleci/nipype |
176 | 179 | command: |
|
177 | 180 | mkdir -p /tmp/docker/cache
|
| 181 | + make gen-base-dockerfile |
| 182 | +
|
178 | 183 | # Use the sha256 sum of the pruned Dockerfile as the cache key.
|
179 |
| - ash prune_dockerfile.sh Dockerfile.base > /tmp/docker/cache/Dockerfile.base-pruned |
| 184 | + ash docker/prune_dockerfile.sh docker/Dockerfile.base > /tmp/docker/cache/Dockerfile.base-pruned |
180 | 185 | - save_cache:
|
181 | 186 | paths:
|
182 | 187 | - /tmp/docker/cache/Dockerfile.base-pruned
|
|
0 commit comments