Skip to content

Commit 9f6544f

Browse files
author
jakubk
committed
generate dockerfiles in ci + rm dockerfiles
1 parent 126831e commit 9f6544f

File tree

3 files changed

+12
-455
lines changed

3 files changed

+12
-455
lines changed

.circleci/config.yml

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,14 @@ jobs:
88
- checkout:
99
path: /home/circleci/nipype
1010
- 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
1313
command: |
1414
mkdir -p /tmp/docker
15+
make gen-base-dockerfile
16+
1517
# 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
1719
- restore_cache:
1820
key: dockerfile-cache-v1-master-{{ checksum "/tmp/docker/Dockerfile.base-pruned" }}
1921
- run:
@@ -43,9 +45,10 @@ jobs:
4345
- attach_workspace:
4446
at: /tmp
4547
- run:
46-
name: Get test dependencies
48+
name: Get test dependencies and generate Dockerfiles
4749
command: |
4850
pip install --no-cache-dir codecov
51+
make gen-dockerfiles
4952
- run:
5053
name: Modify Nipype version if necessary
5154
working_directory: /home/circleci/nipype
@@ -171,12 +174,14 @@ jobs:
171174
docker push nipype/nipype:py36
172175
docker push nipype/nipype:py27
173176
- 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
176179
command: |
177180
mkdir -p /tmp/docker/cache
181+
make gen-base-dockerfile
182+
178183
# 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
180185
- save_cache:
181186
paths:
182187
- /tmp/docker/cache/Dockerfile.base-pruned

Dockerfile

Lines changed: 0 additions & 233 deletions
This file was deleted.

0 commit comments

Comments
 (0)