Skip to content

Commit 3713277

Browse files
committed
final modifications to test dockerfiles
1 parent 25219c1 commit 3713277

File tree

3 files changed

+4
-7
lines changed

3 files changed

+4
-7
lines changed

docker/Dockerfile_py27

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,7 @@ FROM nipype/nipype:latest
3030
MAINTAINER The nipype developers https://github.com/nipy/nipype
3131

3232
# Downgrade python to 2.7
33-
RUN conda install python=2.7 && \
34-
conda update --all -y python=2.7
33+
RUN conda install python=2.7
3534

3635
COPY docker/files/run_* /usr/bin/
3736
RUN chmod +x /usr/bin/run_*
@@ -42,8 +41,7 @@ RUN sed -i 's/\(backend *: \).*$/\1Agg/g' /usr/local/miniconda/lib/python2.7/sit
4241

4342
# Re-install nipype
4443
COPY . /root/src/nipype
45-
RUN rm -r /usr/local/miniconda/lib/python2.7/site-packages/nipype* && \
46-
cd /root/src/nipype && \
44+
RUN cd /root/src/nipype && \
4745
pip install -e .[all]
4846

4947
CMD ["/bin/bash"]

docker/Dockerfile_py34

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,7 @@ RUN sed -i 's/\(backend *: \).*$/\1Agg/g' /usr/local/miniconda/lib/python3.4/sit
4848

4949
# Re-install nipype
5050
COPY . /root/src/nipype
51-
RUN rm -r /usr/local/miniconda/lib/python2.7/site-packages/nipype* && \
52-
cd /root/src/nipype && \
51+
RUN cd /root/src/nipype && \
5352
pip install -e .[all]
5453

5554
CMD ["/bin/bash"]

docker/Dockerfile_py35

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
2727
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2828

29-
FROM nipype/nipype_test:base-0.0.2
29+
FROM nipype/nipype:latest
3030
MAINTAINER The nipype developers https://github.com/nipy/nipype
3131

3232
# Replace imglob with a Python3 compatible version

0 commit comments

Comments
 (0)