Skip to content

ENH: generate Dockerfiles with neurodocker + migrate to CircleCI 2.0 #2202

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

Merged
merged 17 commits into from
Nov 15, 2017
Merged

ENH: generate Dockerfiles with neurodocker + migrate to CircleCI 2.0 #2202

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
7b3c404
enh: generate dockerfiles with neurodocker + rename base dockerfile
Oct 2, 2017
7bc9a2f
enh: migrate to circleci 2.0 + check base dockerfile against cache
Oct 2, 2017
4770217
Merge remote-tracking branch 'upstream/master' into enh/circleci-neur…
Nov 6, 2017
222b15f
add: cli to generate dockerfiles
Nov 6, 2017
3b81bcd
Change default TESTPATH to /src/nipype/nipype from /src/nipype
Nov 6, 2017
86d70f5
enh: use svg travis shield + rm whitespace
Nov 6, 2017
2d15a1e
update circleci config.yml
Nov 6, 2017
70cf230
add: file to prune dockerfiles
Nov 6, 2017
1a2a3c4
regenerate dockerfiles
Nov 6, 2017
9e0571c
enh: update codecov call + reformat
Nov 6, 2017
97b4048
fix path when updating dockerfile cache
Nov 6, 2017
637f033
regenerate dockerfiles with base nipype/nipype:base
Nov 13, 2017
a29400b
enh: optimize + use nipype/nipype dockerhub repo
Nov 13, 2017
399fe16
use nipype/nipype repo instead of kaczmarj/nipype
Nov 13, 2017
126831e
Merge remote-tracking branch 'upstream/master' into enh/circleci-neur…
Nov 13, 2017
28547cc
generate dockerfiles in ci + rm dockerfiles
Nov 15, 2017
56838b9
add jakub kaczmarzyk (mit)
Nov 15, 2017
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
regenerate dockerfiles with base nipype/nipype:base
  • Loading branch information
jakubk committed Nov 13, 2017
commit 637f0335e0e02d96f53fbad7f13f409892196ea9
8 changes: 4 additions & 4 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
# pull request on our GitHub repository:
# https://github.com/kaczmarj/neurodocker
#
# Timestamp: 2017-11-06 21:15:09
# Timestamp: 2017-11-13 16:22:04

FROM kaczmarj/nipype:base
FROM nipype/nipype:base

ARG DEBIAN_FRONTEND=noninteractive

Expand Down Expand Up @@ -132,7 +132,7 @@ RUN echo '{ \
\n "instructions": [ \
\n [ \
\n "base", \
\n "kaczmarj/nipype:base" \
\n "nipype/nipype:base" \
\n ], \
\n [ \
\n "label", \
Expand Down Expand Up @@ -228,6 +228,6 @@ RUN echo '{ \
\n } \
\n ] \
\n ], \
\n "generation_timestamp": "2017-11-06 21:15:09", \
\n "generation_timestamp": "2017-11-13 16:22:04", \
\n "neurodocker_version": "0.3.1-19-g8d02eb4" \
\n}' > /neurodocker/neurodocker_specs.json
4 changes: 2 additions & 2 deletions docker/Dockerfile.base
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# pull request on our GitHub repository:
# https://github.com/kaczmarj/neurodocker
#
# Timestamp: 2017-11-06 21:15:07
# Timestamp: 2017-11-13 16:22:02

FROM neurodebian@sha256:7590552afd0e7a481a33314724ae27f76ccedd05ffd7ac06ec38638872427b9b

Expand Down Expand Up @@ -210,6 +210,6 @@ RUN echo '{ \
\n "gem install fakes3" \
\n ] \
\n ], \
\n "generation_timestamp": "2017-11-06 21:15:07", \
\n "generation_timestamp": "2017-11-13 16:22:02", \
\n "neurodocker_version": "0.3.1-19-g8d02eb4" \
\n}' > /neurodocker/neurodocker_specs.json
2 changes: 1 addition & 1 deletion docker/generate_dockerfiles.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ NEURODOCKER_IMAGE="kaczmarj/neurodocker@sha256:6b5f92f413b9710b7581e62293a8f7443
# neurodebian:stretch-non-free pulled on November 3, 2017
BASE_IMAGE="neurodebian@sha256:7590552afd0e7a481a33314724ae27f76ccedd05ffd7ac06ec38638872427b9b"

NIPYPE_BASE_IMAGE="kaczmarj/nipype:base"
NIPYPE_BASE_IMAGE="nipype/nipype:base"
PKG_MANAGER="apt"
DIR="$(dirname "$0")"

Expand Down