git.iko.soy/stackage
on master help sign in
Attempted Dockerfile simplification
a456081Michael Snoyman
Dockerfile+2−19
compare with master
unifiedsplit
@@ -2,24 +2,7 @@ FROM ubuntu:14.04
2
2
3ENV HOME /home/stackage
3ENV HOME /home/stackage
4ENV LANG en_US.UTF-8
4ENV LANG en_US.UTF-8
5−
5+ENV PATH /opt/ghc/7.10.3/bin:/usr/sbin:/usr/bin:/sbin:/bin
6−RUN mkdir /home/stackage -p
7−RUN locale-gen en_US.UTF-8
8−
9−RUN DEBIAN_FRONTEND=noninteractive apt-get update
10−RUN DEBIAN_FRONTEND=noninteractive apt-get install -y software-properties-common python-software-properties git
11−RUN DEBIAN_FRONTEND=noninteractive add-apt-repository ppa:hvr/ghc -y
12
6
13ADD debian-bootstrap.sh /tmp/debian-bootstrap.sh
7ADD debian-bootstrap.sh /tmp/debian-bootstrap.sh
14−RUN DEBIAN_FRONTEND=noninteractive bash /tmp/debian-bootstrap.sh
15−RUN rm /tmp/debian-bootstrap.sh
8+RUN /tmp/debian-bootstrap.sh && rm /tmp/debian-bootstrap.sh
16−
17−RUN DEBIAN_FRONTEND=noninteractive apt-get install -y cabal-install-1.22 ghc-7.10.3 ghc-7.10.3-htmldocs alex-3.1.3 happy-1.19.4 sudo
18−
19−ENV PATH /home/stackage/.cabal/bin:/usr/local/sbin:/usr/local/bin:/opt/ghc/7.10.3/bin:/opt/cabal/1.22/bin:/opt/alex/3.1.3/bin:/opt/happy/1.19.4/bin:/usr/sbin:/usr/bin:/sbin:/bin
20−
21−RUN cabal update
22−RUN cabal install hscolour cabal-install && cp $HOME/.cabal/bin/* /usr/local/bin && rm -rf $HOME/.cabal $HOME/.ghc /tmp/stackage
23−RUN wget https://s3.amazonaws.com/stackage-travis/stackage-curator/stackage-curator.bz2 && bunzip2 stackage-curator.bz2 && chmod +x stackage-curator && mv stackage-curator /usr/local/bin
24−# Get new hyperlinked Haddocks
25−# RUN mkdir -p /opt/haddock && cd /opt/haddock && wget https://s3.amazonaws.com/download.fpcomplete.com/michael/haddock-2.16.2.tar.gz && tar zxf haddock-2.16.2.tar.gz && rm -f /opt/ghc/7.10.3/bin/haddock && ln -s /opt/haddock/2.16.2/bin/haddock /opt/ghc/7.10.3/bin/haddock
debian-bootstrap.sh+12
@@ -12,6 +12,14 @@
12
12
13set -exu
13set -exu
14
14
15+mkdir /home/stackage -p
16+locale-gen en_US.UTF-8
17+
18+export DEBIAN_FRONTEND=noninteractive
19+apt-get update
20+apt-get install -y software-properties-common python-software-properties git
21+
22+add-apt-repository ppa:hvr/ghc -y
15add-apt-repository -y ppa:zoogie/sdl2-snapshots
23add-apt-repository -y ppa:zoogie/sdl2-snapshots
16add-apt-repository -y ppa:marutter/rrutter
24add-apt-repository -y ppa:marutter/rrutter
17add-apt-repository -y ppa:openstack-ubuntu-testing/icehouse
25add-apt-repository -y ppa:openstack-ubuntu-testing/icehouse
@@ -23,6 +31,10 @@ echo 'deb http://download.fpcomplete.com/ubuntu trusty main'|sudo tee /etc/apt/s
23apt-get update
31apt-get update
24apt-get install -y \
32apt-get install -y \
25 build-essential \
33 build-essential \
34+ ghc-7.10.3 \
35+ ghc-7.10.3-htmldocs \
36+ hscolour \
37+ sudo \
26 curl \
38 curl \
27 freeglut3-dev \
39 freeglut3-dev \
28 git \
40 git \