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: a648d9a4de63
Choose a base ref
...
head repository: mirage/mirage
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 2f71cc08de88
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Sep 18, 2016

  1. doc: add in odoc head branch as an experimental link under docs.mirag… 

    …e.io/odoc
    @avsm
    avsm committed Sep 18, 2016
    Copy the full SHA
    353c73e View commit details

  2. Merge pull request #597 from avsm/doc-odoc 

    doc: add in odoc head branch as an experimental link under docs.mirage.io
    @avsm
    avsm authored Sep 18, 2016
    Copy the full SHA
    2f71cc0 View commit details
Showing with 13 additions and 1 deletion.
  1. +13 −1 Dockerfile.doc
14 changes: 13 additions & 1 deletion Dockerfile.doc
View file
Original file line number Diff line number Diff line change
@@ -15,7 +15,19 @@ RUN opam depext -uivj 3 mirage tcpip tls cohttp lwt irmin ipaddr uri github alco
dns hex pcap-format vchan ctypes channel \
shared-memory-ring \
mirage-fs-unix \
git git-unix mirage-git
git git-unix mirage-git \
core_kernel \
topkg-care
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 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
EXPOSE 8080
ENTRYPOINT opam config exec -- cohttp-server-lwt /home/opam/.opam/4.03.0/var/cache/opkg/ocamldoc