Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ocaml.4.04.2 ... arakoon.1.9.22 #805

Merged
merged 2 commits into from
Aug 24, 2017
Merged

ocaml.4.04.2 ... arakoon.1.9.22 #805

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c87e443
ocaml.4.04.2 ... arakoon.1.9.22
Aug 24, 2017
00671ba
typo + tags/1.9.22 iso commit hash
Aug 24, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 8 additions & 7 deletions docker/centos-7/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,17 +57,17 @@ RUN pip install fabric junit-xml

RUN wget https://raw.github.com/ocaml/opam/master/shell/opam_installer.sh

env ocaml_version=4.03.0
env ocaml_version=4.04.2
RUN sh ./opam_installer.sh /usr/local/bin ${ocaml_version}

ENV opam_root=/home/jenkins/OPAM
ENV opam_env="opam config env --root=${opam_root}"
RUN opam init --root=${opam_root} --comp ${ocaml_version}

RUN eval `${opam_env}` && \
opam update && \
opam update -v && \
opam install -y \
oasis.0.4.8 \
oasis.0.4.10 \
ocamlfind \
omake.0.10.2 \
ssl.0.5.3 \
Expand All @@ -90,11 +90,12 @@ RUN eval `${opam_env}` && \
depext \
kinetic-client \
tiny_json \
ppx_deriving \
ppx_deriving.4.1 \
ppx_deriving_yojson \
core.v0.9.0 \
base.v0.9.3 \
core.v0.9.1 \
redis.0.3.3 \
uri.1.9.2 \
uri.1.9.4 \
result \
ezxmlm

Expand Down Expand Up @@ -151,7 +152,7 @@ RUN cp /usr/local/lib/libgtest.a /lib64/

# install specific arakoon.
RUN git clone https://github.com/openvstorage/arakoon.git
RUN cd arakoon && git pull && git checkout 1.9.21
RUN cd arakoon && git pull && git checkout tags/1.9.22
RUN cd arakoon && eval `${opam_env}` && make
RUN cd arakoon && eval `${opam_env}` \
&& export PREFIX=${opam_root}/${ocaml_version} \
Expand Down
15 changes: 8 additions & 7 deletions docker/ubuntu-14.04/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,17 +80,17 @@ RUN git clone https://github.com/domsj/orocksdb.git \

RUN wget https://raw.github.com/ocaml/opam/master/shell/opam_installer.sh

env ocaml_version=4.03.0
env ocaml_version=4.04.2
RUN sh ./opam_installer.sh /usr/local/bin ${ocaml_version}

ENV opam_root=/home/jenkins/OPAM
ENV opam_env="opam config env --root=${opam_root}"
RUN opam init --root=${opam_root} --comp ${ocaml_version}

RUN eval `${opam_env}` && \
opam update && \
opam update -v && \
opam install -y \
oasis.0.4.8 \
oasis.0.4.10 \
ocamlfind \
omake.0.10.2 \
ssl.0.5.3 \
Expand All @@ -113,11 +113,12 @@ RUN eval `${opam_env}` && \
depext \
kinetic-client \
tiny_json \
ppx_deriving \
ppx_deriving.4.1 \
ppx_deriving_yojson \
core.v0.9.0 \
base.v0.9.3 \
core.v0.9.1 \
redis.0.3.3 \
uri.1.9.2 \
uri.1.9.4 \
result \
ezxmlm

Expand All @@ -136,7 +137,7 @@ RUN cd /usr/src/gtest \

# install specific arakoon.
RUN git clone https://github.com/openvstorage/arakoon.git
RUN cd arakoon && git pull && git checkout 1.9.21
RUN cd arakoon && git pull && git checkout tags/1.9.22
RUN cd arakoon && eval `${opam_env}` && make
RUN cd arakoon && eval `${opam_env}` \
&& export PREFIX=${opam_root}/${ocaml_version} \
Expand Down
15 changes: 8 additions & 7 deletions docker/ubuntu-16.04/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,17 +52,17 @@ RUN git clone https://github.com/domsj/orocksdb.git \

RUN wget https://raw.github.com/ocaml/opam/master/shell/opam_installer.sh

env ocaml_version=4.03.0
env ocaml_version=4.04.2
RUN sh ./opam_installer.sh /usr/local/bin ${ocaml_version}

ENV opam_root=/home/jenkins/OPAM
ENV opam_env="opam config env --root=${opam_root}"
RUN opam init --root=${opam_root} --comp ${ocaml_version}

RUN eval `${opam_env}` && \
opam update && \
opam update -v && \
opam install -y \
oasis.0.4.8 \
oasis.0.4.10 \
ocamlfind \
omake.0.10.2 \
ssl.0.5.3 \
Expand All @@ -85,11 +85,12 @@ RUN eval `${opam_env}` && \
depext \
kinetic-client \
tiny_json \
ppx_deriving \
ppx_deriving.4.1 \
ppx_deriving_yojson \
core.v0.9.0 \
base.v0.9.3 \
core.v0.9.1 \
redis.0.3.3 \
uri.1.9.2 \
uri.1.9.4 \
result \
ezxmlm

Expand All @@ -110,7 +111,7 @@ RUN cd /usr/src/gtest \

# install specific arakoon.
RUN git clone https://github.com/openvstorage/arakoon.git
RUN cd arakoon && git pull && git checkout 1.9.21
RUN cd arakoon && git pull && git checkout tags/1.9.22
RUN cd arakoon && eval `${opam_env}` && make
RUN cd arakoon && eval `${opam_env}` \
&& export PREFIX=${opam_root}/${ocaml_version} \
Expand Down