Skip to content
This repository was archived by the owner on Nov 4, 2022. It is now read-only.

Commit 2b94e84

Browse files
committed
Restructure Julia build
1 parent 9f33cdd commit 2b94e84

File tree

1 file changed

+6
-7
lines changed

1 file changed

+6
-7
lines changed

Dockerfile

+6-7
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
FROM ubuntu:16.04
44

55

6+
ADD package_installs.jl /tmp/package_installs.jl
7+
68
RUN apt-get update && \
79
apt-get install git software-properties-common curl wget libcairo2 libpango1.0-0 -y && \
810
add-apt-repository ppa:staticfloat/julia-deps -y && \
@@ -16,16 +18,13 @@ RUN apt-get update && \
1618
# Use generic instruction set; see https://github.com/JuliaLang/julia/pull/6220
1719
# and https://groups.google.com/forum/#!topic/julia-dev/Eqp0GhZWxME
1820
echo "JULIA_CPU_TARGET=core2" > Make.user && \
19-
make -j 4 julia-deps
20-
21-
ADD package_installs.jl /tmp/package_installs.jl
21+
make -j 4 julia-deps && make -j 4 && make install && \
22+
ln -s /usr/local/src/julia/julia /usr/local/bin/julia
2223

23-
RUN cd /usr/local/src/julia && make && make install && \
24-
ln -s /usr/local/src/julia/julia /usr/local/bin/julia && \
25-
julia /tmp/package_installs.jl
2624

2725
# Pre-compiling packages within a Julia session doesn't seem to work at the moment.
28-
RUN julia -e "Base.compilecache(\"BinDeps\")" && \
26+
RUN julia /tmp/package_installs.jl && \
27+
julia -e "Base.compilecache(\"BinDeps\")" && \
2928
julia -e "Base.compilecache(\"Cairo\")" && \
3029
julia -e "Base.compilecache(\"Calculus\")" && \
3130
julia -e "Base.compilecache(\"Clustering\")" && \

0 commit comments

Comments
 (0)