Skip to content

eio port #349

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

Open
mtelvers wants to merge 2 commits into
base: master
Choose a base branch
from
Open

eio port #349

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
1c1fb57
Port to OCurrent on Eio
mtelvers May 9, 2026
1f20540
Submodule updates
mtelvers May 15, 2026
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
19 changes: 17 additions & 2 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# syntax=docker/dockerfile:1
FROM ocaml/opam:debian-ocaml-4.14 AS build
FROM ocaml/opam:debian-13-ocaml-5.4 AS build
RUN sudo ln -sf /usr/bin/opam-2.5 /usr/bin/opam && opam init --reinit -ni
RUN sudo rm -f /etc/apt/apt.conf.d/docker-clean; echo 'Binary::apt::APT::Keep-Downloaded-Packages "true";' | sudo tee /etc/apt/apt.conf.d/keep-cache
RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
Expand All @@ -14,8 +14,23 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
libssl-dev \
m4 \
pkg-config
RUN cd ~/opam-repository && git fetch -q origin master && git reset --hard 163a32c4d55fd31c455579249c3437165211f302 && opam update
RUN cd ~/opam-repository && git fetch -q origin master && git reset --hard 28d044eb9ccd9b9275c54a845b30932c3d934aa0 && opam update
RUN opam option --global solver=builtin-0install
# OCurrent 2.0 needs the prometheus Eio fork plus all current_* packages
# from the eio branch, and current_ocluster's Eio plugin (which lives on the
# ocluster eio branch alongside its new ocluster-api-eio sibling).
RUN opam pin add -yn prometheus.dev https://github.com/mtelvers/prometheus.git#eio && \
opam pin add -yn prometheus-app.dev https://github.com/mtelvers/prometheus.git#eio && \
opam pin add -yn current.dev https://github.com/mtelvers/ocurrent.git#eio && \
opam pin add -yn current_term.dev https://github.com/mtelvers/ocurrent.git#eio && \
opam pin add -yn current_web.dev https://github.com/mtelvers/ocurrent.git#eio && \
opam pin add -yn current_git.dev https://github.com/mtelvers/ocurrent.git#eio && \
opam pin add -yn current_github.dev https://github.com/mtelvers/ocurrent.git#eio && \
opam pin add -yn current_docker.dev https://github.com/mtelvers/ocurrent.git#eio && \
opam pin add -yn current_slack.dev https://github.com/mtelvers/ocurrent.git#eio && \
opam pin add -yn current_rpc.dev https://github.com/mtelvers/ocurrent.git#eio && \
opam pin add -yn ocluster-api-eio.dev https://github.com/mtelvers/ocluster.git#eio && \
opam pin add -yn current_ocluster.dev https://github.com/mtelvers/ocluster.git#eio
COPY --chown=opam --link base-images.opam /src/
WORKDIR /src
RUN --mount=type=cache,target=/home/opam/.opam/download-cache,sharing=locked,uid=1000,gid=1000 \
Expand Down
6 changes: 3 additions & 3 deletions base-images.opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ homepage: "https://github.com/ocurrent/docker-base-images"
bug-reports: "https://github.com/ocurrent/docker-base-images/issues"
depends: [
"dune" {>= "3.17"}
"ocaml" {>= "4.14"}
"conf-libev" {os != "win32"}
"ocaml" {>= "5.0"}
"prometheus-app" {>= "1.0"}
"ppx_sexp_conv"
"ppx_deriving_yojson"
"ppx_deriving"
"lwt" {>= "5.9.0"}
"eio"
"eio_main"
"logs"
"fmt" {>= "0.8.7"}
"current" {>= "0.7.0"}
Expand Down
Loading