Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: mirage/mirage
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: e7064aa3a79a
Choose a base ref
...
head repository: mirage/mirage
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: a43772f0061b
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Sep 28, 2016

  1. doc: rename odoc->odig and do not install it twice

    @avsm
    avsm committed Sep 28, 2016
    Copy the full SHA
    0455240 View commit details

  2. Merge pull request #598 from avsm/master 

    doc: rename odoc->odig and do not install it twice
    @avsm
    avsm authored Sep 28, 2016
    Copy the full SHA
    a43772f View commit details
Showing with 7 additions and 9 deletions.
  1. +7 −9 Dockerfile.doc
16 changes: 7 additions & 9 deletions Dockerfile.doc
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
FROM ocaml/opam:debian-stable_ocaml-4.03.0
RUN cd /home/opam/opam-repository && git pull origin master && opam update
RUN opam remote add mirage-dev git://github.com/mirage/mirage-dev
RUN opam pin add -n opkg https://github.com/dbuenzli/opkg.git
RUN opam depext -uivy -j 2 opkg
RUN opam pin add -n odig https://github.com/dbuenzli/odig.git
RUN opam depext -uivy -j 2 odig
RUN opam depext -uivj 3 mirage tcpip tls cohttp lwt irmin ipaddr uri github alcotest \
mirage-block-xen mirage-block-unix \
mirage-clock-unix mirage-clock-xen \
@@ -17,23 +17,21 @@ RUN opam depext -uivj 3 mirage tcpip tls cohttp lwt irmin ipaddr uri github alco
mirage-fs-unix \
git git-unix mirage-git \
core_kernel \
topkg-care \
todig-care \
websocket \
cowabloga \
ezxmlm \
vhd-format \
dockerfile \
qcow-format
RUN opam config exec -- opkg ocamldoc
RUN opam pin add -n opkg https://github.com/dbuenzli/opkg.git
RUN opam depext -uivy -j 2 opkg
RUN opam config exec -- odig ocamldoc
RUN opam pin add -n octavius git://github.com/ocaml-doc/octavius
RUN opam pin add -n doc-ock git://github.com/ocaml-doc/doc-ock
RUN opam pin add -n doc-ock-xml git://github.com/ocaml-doc/doc-ock-xml
RUN opam pin add -n doc-ock-html git://github.com/ocaml-doc/doc-ock-html
RUN opam pin add -n odoc git://github.com/ocaml-doc/odoc
RUN opam depext -uivy -j 2 odoc
RUN opam config exec -- opkg odoc
RUN ln -s /home/opam/.opam/4.03.0/var/cache/opkg/odoc /home/opam/.opam/4.03.0/var/cache/opkg/ocamldoc/odoc
RUN opam config exec -- odig odoc
RUN ln -s /home/opam/.opam/4.03.0/var/cache/odig/odoc /home/opam/.opam/4.03.0/var/cache/odig/ocamldoc/odoc
EXPOSE 8080
ENTRYPOINT opam config exec -- cohttp-server-lwt /home/opam/.opam/4.03.0/var/cache/opkg/ocamldoc
ENTRYPOINT opam config exec -- cohttp-server-lwt /home/opam/.opam/4.03.0/var/cache/odig/ocamldoc