diff --git a/Dockerfile b/Dockerfile index e7c74643..7b25e529 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,30 +7,35 @@ # sudo docker run -rm -i -t IHaskell:dev console -from zsol/haskell-platform-2013.2.0.0:latest -maintainer gregweber +FROM gregweber/haskell-platform-2013.2-deb64 +MAINTAINER gregweber RUN sudo apt-get update -RUN sudo apt-get install -yq git pkg-config libtool automake libncurses5-dev python-dev - -RUN curl -L https://github.com/zeromq/zeromq4-x/archive/v4.0.3.tar.gz > v4.0.3.tar.gz && \ +RUN sudo apt-get install -yq g++ git pkg-config libtool automake libncurses5-dev python-dev +RUN wget https://github.com/zeromq/zeromq4-x/archive/v4.0.3.tar.gz && \ tar xvfz v4.0.3.tar.gz && \ cd zeromq4-x-4.0.3 && \ ./autogen.sh && ./configure && \ make && sudo make install && \ - sudo ldconfig + sudo ldconfig && \ + cd .. && rm -r zeromq4-x-4.0.3 && rm v4.0.3.tar.gz RUN cabal update RUN cabal install happy-1.19.3 cpphs-1.18.3 ENV PATH /home/haskell/.cabal/bin:$PATH +# IHaskell dependencies used by Haskell code +# IHaskell console installer expects curl +# some extensions require C libraries +RUN sudo apt-get install -yq curl libgtk2.0-dev libgtk-3-dev libmagic-dev + # use local modifications of source code ADD . /home/haskell/IHaskell # Alternative, use latest master # RUN git clone https://github.com/gibiansky/IHaskell -RUN cd IHaskell && ./build.sh all +RUN cd ~/IHaskell && ./build.sh all # Alternative, install everything directly from hackage without using a repo # RUN cabal install ipython-kernel ihaskell-aeson ihaskell-blaze gtk2hs-buildtools ihaskell-diagrams ihaskell-display ihaskell-magic diff --git a/README.md b/README.md index dcaab6d9..62c73a48 100644 --- a/README.md +++ b/README.md @@ -24,14 +24,13 @@ As well as the IPython browser-based notebook interface: Linux Package Installation === -There is a Docker package for Linux. We will put it up on the registry, but for now you can build it yourself by cloning the repo and running: +There is a Docker package for Linux. - sudo docker build -t IHaskell:dev . - sudo docker run -p 8778:8778 IHaskell:dev + sudo docker run -p 8778:8778 gregweber/ihaskell -The console (instead of the browser) can be run with +This is defaulted to run the browser. You can run the console instead with - sudo docker run -rm -i -t IHaskell:dev console + sudo docker run -rm -i -t gregweber/ihaskell console Windows Installation === diff --git a/ihaskell.cabal b/ihaskell.cabal index 1bd3a6eb..11d6c798 100644 --- a/ihaskell.cabal +++ b/ihaskell.cabal @@ -110,8 +110,9 @@ library IHaskell.Flags IHaskell.Types IHaskell.BrokenPackages - other-modules: Paths_ihaskell +-- other-modules: +-- Paths_ihaskell executable IHaskell -- .hs or .lhs file containing the Main module.