Skip to content

Commit

Permalink
Merge pull request #607 from samoht/opam-repo-updates
Browse files Browse the repository at this point in the history 
Dockerfile: update to latest opam-repository
  • Loading branch information
@samoht
samoht committed Jul 3, 2017
2 parents a8d0391 + 5d01571 commit 97b3d23
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 7 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ FROM ocaml/opam-dev@sha256:1dd4440b3e5f182f705cb5a74f9d4e860c2842b45ed72c199de89
#FROM ocaml/opam-dev:alpine-3.5_ocaml-4.04.0

RUN git -C /home/opam/opam-repository fetch origin && \
git -C /home/opam/opam-repository reset 48cd3001d --hard && \
git -C /home/opam/opam-repository reset 482bd5f55 --hard && \
opam update -u

ENV OPAMERRLOGLEN=0 OPAMYES=1
Expand Down
6 changes: 2 additions & 4 deletions Dockerfile.ci
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,11 @@ FROM ocaml/opam-dev@sha256:1dd4440b3e5f182f705cb5a74f9d4e860c2842b45ed72c199de89
#FROM ocaml/opam-dev:alpine-3.5_ocaml-4.04.0

RUN git -C /home/opam/opam-repository fetch origin && \
git -C /home/opam/opam-repository reset 48cd3001d --hard && \
git -C /home/opam/opam-repository reset 482bd5f55 --hard && \
opam update -u

ENV OPAMERRLOGLEN=0 OPAMYES=1
RUN sudo apk add tzdata aspcud

RUN opam pin add protocol-9p-unix.dev --dev -n
RUN sudo apk update && sudo apk add tzdata aspcud

RUN opam depext -i asl win-eventlog alcotest mtime mirage-flow hvsock \
git irmin irmin-unix lwt protocol-9p-unix tyxml redis multipart-form-data \
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.client
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ FROM ocaml/opam-dev@sha256:1dd4440b3e5f182f705cb5a74f9d4e860c2842b45ed72c199de89
#FROM ocaml/opam:alpine-3.5_ocaml-4.04.0

RUN git -C /home/opam/opam-repository fetch origin && \
git -C /home/opam/opam-repository reset 48cd3001d --hard && \
git -C /home/opam/opam-repository reset 482bd5f55 --hard && \
opam update -u

ENV OPAMERRLOGLEN=0 OPAMYES=1
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.github
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ FROM ocaml/opam-dev@sha256:1dd4440b3e5f182f705cb5a74f9d4e860c2842b45ed72c199de89
#FROM ocaml/opam-dev:alpine-3.5_ocaml-4.04.0

RUN git -C /home/opam/opam-repository fetch origin && \
git -C /home/opam/opam-repository reset 48cd3001d --hard && \
git -C /home/opam/opam-repository reset 482bd5f55 --hard && \
opam update -u

ENV OPAMERRLOGLEN=0 OPAMYES=1
Expand Down

0 comments on commit 97b3d23

Please sign in to comment.