Skip to content

Commit 5b6479b

Browse files
authored
Merge pull request #62 from postylem/master
Update Dockerfile Julia 1.3.1->1.5.3
2 parents 0f9b30b + ba9f734 commit 5b6479b

File tree

2 files changed

+29
-18
lines changed

2 files changed

+29
-18
lines changed

Dockerfile

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,18 @@ RUN git config --global user.email "[email protected]"
1717
RUN virtualenv -p /usr/bin/python3 /venv
1818
RUN . /venv/bin/activate && pip install jupyter jupytext matplotlib tensorflow torch
1919

20-
RUN wget https://julialang-s3.julialang.org/bin/linux/x64/1.3/julia-1.3.1-linux-x86_64.tar.gz
21-
RUN tar -xzv < julia-1.3.1-linux-x86_64.tar.gz
22-
RUN ln -s /julia-1.3.1/bin/julia /usr/bin/julia
20+
# Specify Julia version. Find current version on https://julialang.org/downloads/
21+
ARG JULIA_VERSION_SHORT="1.5"
22+
ARG JULIA_VERSION_FULL="${JULIA_VERSION_SHORT}.3"
23+
ENV JULIA_INSTALLATION_PATH=/opt/julia
24+
25+
RUN wget https://julialang-s3.julialang.org/bin/linux/x64/${JULIA_VERSION_SHORT}/julia-${JULIA_VERSION_FULL}-linux-x86_64.tar.gz && \
26+
tar zxf julia-${JULIA_VERSION_FULL}-linux-x86_64.tar.gz && \
27+
mkdir -p "${JULIA_INSTALLATION_PATH}" && \
28+
mv julia-${JULIA_VERSION_FULL} "${JULIA_INSTALLATION_PATH}/" && \
29+
ln -fs "${JULIA_INSTALLATION_PATH}/julia-${JULIA_VERSION_FULL}/bin/julia" /usr/local/bin/ && \
30+
rm julia-${JULIA_VERSION_FULL}-linux-x86_64.tar.gz && \
31+
julia -e 'import Pkg; Pkg.add("IJulia")'
2332

2433
ADD . /gen-quickstart
2534
ENV JULIA_PROJECT=/gen-quickstart

Dockerfile.ubuntu-2004

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ MAINTAINER MIT Probabilistic Computing Project
44
# Avoid tzdata configuration dialog
55
ENV DEBIAN_FRONTEND=noninteractive
66

7-
RUN apt update -qq && apt install -qq -y \
7+
RUN apt-get update -qq && \
8+
apt-get install -qq -y \
89
hdf5-tools \
910
git \
1011
python3-dev \
@@ -14,23 +15,24 @@ RUN apt update -qq && apt install -qq -y \
1415
zlib1g-dev && \
1516
rm -rf /var/lib/apt/lists/*
1617

17-
# Since Tensorflow only supports Python up to 3.7 and not 3.8 (default in 20.04) instead of tensorflow or tf-nightly-cpu we use
18-
# Tensorflow wheel files from https://pypi.org/project/tf-nightly/2.2.0.dev20200307/#files
19-
RUN wget https://files.pythonhosted.org/packages/30/8e/650b282491e126a39e2b256f1ad790d566c53465dfd801a7703e421431e3/tf_nightly-2.2.0.dev20200307-cp38-cp38-manylinux2010_x86_64.whl && \
20-
python3 -m pip install --upgrade pip && \
21-
python3 -m pip install tf_nightly-2.2.0.dev20200307-cp38-cp38-manylinux2010_x86_64.whl && \
22-
rm tf_nightly-2.2.0.dev20200307-cp38-cp38-manylinux2010_x86_64.whl
18+
RUN git config --global user.name "Gen User" && \
19+
git config --global user.email "[email protected]"
2320

24-
RUN git config --global user.name "Gen User"
25-
RUN git config --global user.email "[email protected]"
21+
RUN python3 -m pip install --upgrade pip && \
22+
python3 -m pip install jupyter jupytext matplotlib tensorflow torch
2623

27-
# Could use virtual environment - "RUN virtualenv -p /usr/bin/python3 /venv" and ". /venv/bin/activate" && in front of pip and julia commands
28-
RUN python3 -m pip install jupyter jupytext matplotlib
24+
# Specify Julia version. Find current version on https://julialang.org/downloads/
25+
ARG JULIA_VERSION_SHORT="1.5"
26+
ARG JULIA_VERSION_FULL="${JULIA_VERSION_SHORT}.3"
27+
ENV JULIA_INSTALLATION_PATH=/opt/julia
2928

30-
RUN wget https://julialang-s3.julialang.org/bin/linux/x64/1.3/julia-1.3.1-linux-x86_64.tar.gz && \
31-
tar -xzv < julia-1.3.1-linux-x86_64.tar.gz && \
32-
ln -s /julia-1.3.1/bin/julia /usr/bin/julia && \
33-
rm julia-1.3.1-linux-x86_64.tar.gz
29+
RUN wget https://julialang-s3.julialang.org/bin/linux/x64/${JULIA_VERSION_SHORT}/julia-${JULIA_VERSION_FULL}-linux-x86_64.tar.gz && \
30+
tar zxf julia-${JULIA_VERSION_FULL}-linux-x86_64.tar.gz && \
31+
mkdir -p "${JULIA_INSTALLATION_PATH}" && \
32+
mv julia-${JULIA_VERSION_FULL} "${JULIA_INSTALLATION_PATH}/" && \
33+
ln -fs "${JULIA_INSTALLATION_PATH}/julia-${JULIA_VERSION_FULL}/bin/julia" /usr/local/bin/ && \
34+
rm julia-${JULIA_VERSION_FULL}-linux-x86_64.tar.gz && \
35+
julia -e 'import Pkg; Pkg.add("IJulia")'
3436

3537
ADD . /gen-quickstart
3638
ENV JULIA_PROJECT=/gen-quickstart

0 commit comments

Comments
 (0)