Skip to content

Commit f60fa28

Browse files
authored
Merge pull request #1204 from oesteban/enh/docker-workdir
[ENH] Change WORKDIR of Docker image
2 parents 85c06a3 + 3829dc3 commit f60fa28

File tree

2 files changed

+6
-8
lines changed

2 files changed

+6
-8
lines changed

.circleci/config.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -202,9 +202,8 @@ jobs:
202202
no_output_timeout: 2h
203203
command: |
204204
docker run -ti --rm=false \
205-
--entrypoint="/usr/local/miniconda/bin/py.test" \
206-
poldracklab/fmriprep:latest . \
207-
--doctest-modules --ignore=docs --ignore=setup.py
205+
--entrypoint="py.test" poldracklab/fmriprep:latest \
206+
/root/src/fmriprep/ --doctest-modules --ignore=docs --ignore=setup.py
208207
- run:
209208
name: Test fmriprep-wrapper (Python 2)
210209
command: |
@@ -268,7 +267,7 @@ jobs:
268267
docker run -ti --rm=false -v $PWD:/_build_html \
269268
--entrypoint=sphinx-build poldracklab/fmriprep:latest \
270269
-T -E -b html -d _build/doctrees-readthedocs -W -D \
271-
language=en docs/ /_build_html 2>&1 \
270+
language=en /root/src/fmriprep/docs/ /_build_html 2>&1 \
272271
| tee $PWD/builddocs.log
273272
cat $PWD/builddocs.log
274273
grep -qv "ERROR" $PWD/builddocs.log

Dockerfile

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -160,9 +160,7 @@ RUN echo "${VERSION}" > /root/src/fmriprep/fmriprep/VERSION && \
160160
rm -rf ~/.cache/pip
161161

162162
RUN ldconfig
163-
164-
WORKDIR /root/src/fmriprep
165-
163+
WORKDIR /scratch
166164
ENTRYPOINT ["/usr/local/miniconda/bin/fmriprep"]
167165

168166
ARG BUILD_DATE
@@ -171,8 +169,9 @@ ARG VERSION
171169
LABEL org.label-schema.build-date=$BUILD_DATE \
172170
org.label-schema.name="FMRIPREP" \
173171
org.label-schema.description="FMRIPREP - robust fMRI preprocessing tool" \
174-
org.label-schema.url="http://fmriprep.readthedocs.io" \
172+
org.label-schema.url="http://fmriprep.org" \
175173
org.label-schema.vcs-ref=$VCS_REF \
176174
org.label-schema.vcs-url="https://github.com/poldracklab/fmriprep" \
177175
org.label-schema.version=$VERSION \
178176
org.label-schema.schema-version="1.0"
177+

0 commit comments

Comments
 (0)