Skip to content

Commit

Permalink
Dockerfile now uses make. Fixes build after addition of LLVM extens…
Browse files Browse the repository at this point in the history 
…ions in c++.
  • Loading branch information
@waj
waj committed Sep 9, 2015
1 parent 87abbda commit 320b3a3
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 5 deletions.
3 changes: 3 additions & 0 deletions .dockerignore
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
.git
.crystal
.vagrant
9 changes: 4 additions & 5 deletions Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,9 @@ RUN curl http://crystal-lang.s3.amazonaws.com/pcl/libpcl-1.12-1-linux-x86_64.tar
ADD . /opt/crystal-head

WORKDIR /opt/crystal-head
ENV CRYSTAL_CONFIG_VERSION head
ENV CRYSTAL_CONFIG_VERSION HEAD
ENV CRYSTAL_CONFIG_PATH libs:/opt/crystal-head/src:/opt/crystal-head/libs

RUN PATH=$PATH:/opt/llvm-3.5.0-1/bin ./bin/crystal build --release src/compiler/crystal.cr

ENV LIBRARY_PATH /opt/crystal/embedded/lib
ENV PATH /opt/crystal-head:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
ENV PATH /opt/crystal-head/bin:/opt/llvm-3.5.0-1/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin

RUN make clean crystal release=1

0 comments on commit 320b3a3

Please sign in to comment.