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

Update docker repo, and mirage-net-psock dependency #8

Open
wants to merge 4 commits into
base: 0.5.3-dev
Choose a base branch
from
Open

Update docker repo, and mirage-net-psock dependency #8

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
32d495a
Update docker repo, and mirage-net-psock dependency
Cjen1 Nov 14, 2019
eadcfda
Update ocaml/opam-dev repo to ocaml/opam2. Add OPAMYES environmnet va…
Cjen1 Dec 13, 2019
cda3b92
Fix OCAMLYES -> OPAMYES
Cjen1 Dec 27, 2019
e5e82f6
fix testing infrastructure to force rebuild
Cjen1 Jan 1, 2020
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
6 changes: 4 additions & 2 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
#FROM databoxsystems/base-image-ocaml:alpine-3.4_ocaml-4.04.2 as BUILDER
FROM ocaml/opam:alpine-3.6_ocaml-4.04.2 as BUILDER
FROM ocaml/opam2:alpine-3.7-ocaml-4.04 as BUILDER

ENV OCAMLYES=true
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should be OPAMYES, no?


WORKDIR /core-network
ADD core-network.export core-network.export

RUN sudo apk update && sudo apk add alpine-sdk bash gmp-dev perl autoconf linux-headers &&\
#opam remote add git https://github.com/ocaml/opam-repository.git &&\
opam pin add -n mirage-net-psock.0.1.0 https://github.com/sevenEng/mirage-net-psock.git &&\
opam pin add -n mirage-net-psock.0.1.0 https://github.com/sevenEng/mirage-net-psock.git#921900d502504ac46ef63b52935e4398d24647f4 &&\
opam switch import core-network.export

ADD . .
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile-aarch64
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ FROM jptmoore/alpine-baseimage-aarch64
USER databox
RUN sudo apk add libffi-dev libressl-dev linux-headers bash autoconf
RUN opam remove ezirmin irmin re.1.7.1 bos lwt
RUN opam pin add -n mirage-net-psock.0.1.0 https://github.com/sevenEng/mirage-net-psock.git
RUN opam pin add -n mirage-net-psock.0.1.0 https://github.com/sevenEng/mirage-net-psock.git#921900d502504ac46ef63b52935e4398d24647f4 -y

ADD core-network.export core-network.export
RUN opam switch import core-network.export
Expand Down
8 changes: 5 additions & 3 deletions Dockerfile-relay
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
FROM ocaml/opam:alpine-3.6_ocaml-4.04.2 as builder
FROM ocaml/opam2:alpine-3.7-ocaml-4.04 as BUILDER

WORKDIR /core-network
ADD core-network.export core-network.export

ENV OCAMLYES=true
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OPAMYES...?


RUN sudo apk update && sudo apk add alpine-sdk bash gmp-dev perl autoconf linux-headers &&\
#opam remote add git https://github.com/ocaml/opam-repository.git &&\
opam pin add -n mirage-net-psock.0.1.0 https://github.com/sevenEng/mirage-net-psock.git &&\
opam pin add -n mirage-net-psock.0.1.0 https://github.com/sevenEng/mirage-net-psock.git#921900d502504ac46ef63b52935e4398d24647f4 &&\
opam switch import core-network.export

ADD . .
Expand All @@ -20,4 +22,4 @@ COPY --from=builder /core-network/_build/default/bin/relay.exe bcast-relay

LABEL databox.type="core-network-broadcast-relay"

ENTRYPOINT ["./bcast-relay"]
ENTRYPOINT ["./bcast-relay"]
6 changes: 3 additions & 3 deletions Dockerfile-relay-aarch64
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ FROM jptmoore/alpine-baseimage-aarch64

USER databox
RUN sudo apk add libffi-dev libressl-dev linux-headers bash autoconf
RUN opam remove ezirmin irmin re.1.7.1 bos lwt
RUN opam pin add -n mirage-net-psock.0.1.0 https://github.com/sevenEng/mirage-net-psock.git
RUN opam remove ezirmin irmin re.1.7.1 bos lwt -y
RUN opam pin add -n mirage-net-psock.0.1.0 https://github.com/sevenEng/mirage-net-psock.git#921900d502504ac46ef63b52935e4398d24647f4 -y

ADD core-network.export core-network.export
RUN opam switch import core-network.export
RUN opam switch import core-network.export -y

# add the code
ADD bin bin
Expand Down