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 Dockerfiles and dependencies #252

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update Dockerfiles and dependencies #252

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 4 additions & 3 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
FROM ocaml/opam:debian-12-ocaml-4.14@sha256:650f6b9780c41f4ab594930957aa25012c60114d97638686678eb6979aa7df87 AS build
# syntax=docker/dockerfile:1
FROM ocaml/opam:debian-12-ocaml-4.14@sha256:be38063c43f00b0627de62144f24dc8c9929504f0db4774343d7bffc62777073 AS build
RUN sudo ln -f /usr/bin/opam-2.2 /usr/bin/opam && opam init --reinit -ni
RUN sudo apt-get update && sudo apt-get install libev-dev capnproto libcapnp-dev m4 pkg-config libsqlite3-dev libgmp-dev -y --no-install-recommends
RUN sudo ln -f /usr/bin/opam-2.1 /usr/bin/opam && opam init --reinit -ni
RUN cd ~/opam-repository && git fetch -q origin master && git reset --hard 76d09264e920a27527de605cc64ef1d28ec353cd && opam update
RUN cd ~/opam-repository && git fetch -q origin master && git reset --hard 1b4da5019e5ea60af76c94aacc672a7e9659a832 && opam update
COPY --chown=opam ocluster-api.opam ocluster-worker.opam ocluster.opam /src/
COPY --chown=opam obuilder/obuilder.opam obuilder/obuilder-spec.opam /src/obuilder/
RUN opam pin -yn /src/obuilder/
Expand Down
9 changes: 5 additions & 4 deletions Dockerfile.worker
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
FROM ocaml/opam:ubuntu-22.04-ocaml-4.14@sha256:41ce765f59ecde9d8525ec58e0da7cd1317f3798d2c4951186aeef2ce804fad5 AS build
# syntax=docker/dockerfile:1
FROM ocaml/opam:ubuntu-24.04-ocaml-4.14@sha256:96517e22343713a96a55aee23d13db8e4f3595cc47413f738dcc686a33684835 AS build
RUN sudo ln -f /usr/bin/opam-2.2 /usr/bin/opam && opam init --reinit -ni
RUN sudo apt-get update && sudo apt-get install libev-dev capnproto libcapnp-dev m4 pkg-config libsqlite3-dev libgmp-dev -y --no-install-recommends
RUN sudo ln -f /usr/bin/opam-2.1 /usr/bin/opam && opam init --reinit -ni
RUN cd ~/opam-repository && git fetch -q origin master && git reset --hard 47a1176c71e6b07f26b724409a88340f8bac3a42 && opam update
RUN cd ~/opam-repository && git fetch -q origin master && git reset --hard 1b4da5019e5ea60af76c94aacc672a7e9659a832 && opam update
COPY --chown=opam ocluster-api.opam ocluster-worker.opam ocluster.opam /src/
COPY --chown=opam obuilder/obuilder.opam obuilder/obuilder-spec.opam /src/obuilder/
RUN opam pin -yn /src/obuilder/
Expand All @@ -11,7 +12,7 @@ ADD --chown=opam . .
RUN opam exec -- dune subst
RUN opam exec -- dune build ./_build/install/default/bin/ocluster-worker

FROM ubuntu:jammy-20221130
FROM ubuntu:24.04
RUN apt-get update && apt-get install docker.io libev4 curl gnupg2 git libsqlite3-dev ca-certificates netbase -y --no-install-recommends
WORKDIR /var/lib/ocluster-worker
ENTRYPOINT ["/usr/local/bin/ocluster-worker"]
Expand Down
9 changes: 5 additions & 4 deletions Dockerfile.worker.alpine
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
FROM ocaml/opam:alpine-3.17-ocaml-4.14@sha256:df87c00eb4b212b8b42e3cbf37b7729507bb398b4bf19c9df0e2d84d1c41e46d AS build
# syntax=docker/dockerfile:1
FROM ocaml/opam:alpine-3.20-ocaml-4.14@sha256:1946904456dca358d7031ac517900714ce71981defc577f6dad16bd1a5be1108 AS build
RUN sudo ln -f /usr/bin/opam-2.2 /usr/bin/opam && opam init --reinit -ni
RUN sudo apk update && sudo apk add libev capnproto m4 sqlite libgmpxx
RUN sudo ln -f /usr/bin/opam-2.1 /usr/bin/opam && opam init --reinit -ni
RUN cd ~/opam-repository && git fetch -q origin master && git reset --hard 47a1176c71e6b07f26b724409a88340f8bac3a42 && opam update
RUN cd ~/opam-repository && git fetch -q origin master && git reset --hard 1b4da5019e5ea60af76c94aacc672a7e9659a832 && opam update
COPY --chown=opam ocluster-api.opam ocluster-worker.opam ocluster.opam /src/
COPY --chown=opam obuilder/obuilder.opam obuilder/obuilder-spec.opam /src/obuilder/
RUN opam pin -yn /src/obuilder/
Expand All @@ -11,7 +12,7 @@ ADD --chown=opam . .
RUN opam exec -- dune subst
RUN opam exec -- dune build ./_build/install/default/bin/ocluster-worker

FROM alpine:3.17
FROM alpine:3.20
RUN apk update && apk add docker libev curl gnupg git sqlite
WORKDIR /var/lib/ocluster-worker
ENTRYPOINT ["/usr/local/bin/ocluster-worker"]
Expand Down
6 changes: 3 additions & 3 deletions current_ocluster.opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,16 @@ homepage: "https://github.com/ocurrent/ocluster"
doc: "https://ocurrent.github.io/ocluster/"
bug-reports: "https://github.com/ocurrent/ocluster/issues"
depends: [
"dune" {>= "3.7"}
"dune" {>= "3.16"}
"ocluster-api" {= version}
"ocaml" {>= "4.14.1"}
"ocaml" {>= "4.14"}
"capnp-rpc-unix" {>= "1.2.3"}
"current" {>= "0.6.4"}
"current_git" {>= "0.6.4"}
"duration"
"fmt"
"logs"
"lwt" {>= "5.6.1"}
"lwt" {>= "5.7.0"}
"ppx_deriving"
"ppx_deriving_yojson"
"prometheus" {>= "1.2"}
Expand Down
20 changes: 10 additions & 10 deletions dune-project
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
(lang dune 3.7)
(lang dune 3.16)
(name ocluster)
(formatting disabled)
(generate_opam_files true)
Expand All @@ -22,10 +22,10 @@
(synopsis "Cap'n Proto API for OCluster")
(description "OCaml bindings for the OCluster Cap'n Proto API.")
(depends
(ocaml (>= 4.14.1))
(ocaml (>= 4.14))
(capnp-rpc-lwt (>= 1.2.3))
fmt
(lwt (>= 5.6.1))
(lwt (>= 5.7.0))
ppx_deriving
ppx_deriving_yojson))

Expand All @@ -35,14 +35,14 @@
(description "OCluster library for defining workers")
(depends
(ocluster-api (= :version))
(ocaml (>= 4.14.1))
(ocaml (>= 4.14))
(capnp-rpc-lwt (>= 1.2.3))
(cohttp-lwt-unix (>= 4.0))
(digestif (>= 0.8))
(extunix (>= 0.4.1))
fpath
logs
(lwt (>= 5.6.1))
(lwt (>= 5.7.0))
(obuilder (>= 0.5.1))
(prometheus-app (>= 1.2))))

Expand All @@ -53,18 +53,18 @@
(depends
(ocluster-api (= :version))
(ocluster-worker (= :version))
(ocaml (>= 4.14.1))
(ocaml (>= 4.14))
(capnp-rpc-lwt (>= 1.2.3))
(capnp-rpc-net (>= 1.2.3))
(capnp-rpc-unix (>= 1.2.3))
(cmdliner (>= 1.2.0))
(cmdliner (>= 1.3.0))
(conf-libev (<> :os "win32"))
(digestif (>= 0.8))
dune-build-info
fmt
fpath
logs
(lwt (>= 5.6.1))
(lwt (>= 5.7.0))
lwt-dllist
(mirage-crypto (>= 0.8.5))
(obuilder (>= 0.5.1))
Expand All @@ -88,14 +88,14 @@
"Creates a stage in an OCurrent pipeline for submitting jobs to OCluster.")
(depends
(ocluster-api (= :version))
(ocaml (>= 4.14.1))
(ocaml (>= 4.14))
(capnp-rpc-unix (>= 1.2.3))
(current (>= 0.6.4))
(current_git (>= 0.6.4))
duration
fmt
logs
(lwt (>= 5.6.1))
(lwt (>= 5.7.0))
ppx_deriving
ppx_deriving_yojson
(prometheus (>= 1.2))
Expand Down
2 changes: 1 addition & 1 deletion obuilder
Open in desktop
Submodule obuilder updated 14 files
+8 −8 dune-project
+4 −4 example.spec
+4 −4 example.windows.spec
+1 −2 lib/archive_extract.ml
+3 −6 lib/btrfs_store.ml
+1 −1 lib/build_log.ml
+6 −6 lib/docker_store.ml
+3 −52 lib/os.ml
+3 −2 lib/overlayfs_store.ml
+1 −1 lib/rsync_store.ml
+2 −2 lib/xfs_store.ml
+1 −1 lib/zfs_store.ml
+2 −2 obuilder-spec.opam
+7 −7 obuilder.opam
6 changes: 3 additions & 3 deletions ocluster-api.opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@ homepage: "https://github.com/ocurrent/ocluster"
doc: "https://ocurrent.github.io/ocluster/"
bug-reports: "https://github.com/ocurrent/ocluster/issues"
depends: [
"dune" {>= "3.7"}
"ocaml" {>= "4.14.1"}
"dune" {>= "3.16"}
"ocaml" {>= "4.14"}
"capnp-rpc-lwt" {>= "1.2.3"}
"fmt"
"lwt" {>= "5.6.1"}
"lwt" {>= "5.7.0"}
"ppx_deriving"
"ppx_deriving_yojson"
"odoc" {with-doc}
Expand Down
6 changes: 3 additions & 3 deletions ocluster-worker.opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,16 @@ homepage: "https://github.com/ocurrent/ocluster"
doc: "https://ocurrent.github.io/ocluster/"
bug-reports: "https://github.com/ocurrent/ocluster/issues"
depends: [
"dune" {>= "3.7"}
"dune" {>= "3.16"}
"ocluster-api" {= version}
"ocaml" {>= "4.14.1"}
"ocaml" {>= "4.14"}
"capnp-rpc-lwt" {>= "1.2.3"}
"cohttp-lwt-unix" {>= "4.0"}
"digestif" {>= "0.8"}
"extunix" {>= "0.4.1"}
"fpath"
"logs"
"lwt" {>= "5.6.1"}
"lwt" {>= "5.7.0"}
"obuilder" {>= "0.5.1"}
"prometheus-app" {>= "1.2"}
"odoc" {with-doc}
Expand Down
8 changes: 4 additions & 4 deletions ocluster.opam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,21 +27,21 @@ homepage: "https://github.com/ocurrent/ocluster"
doc: "https://ocurrent.github.io/ocluster/"
bug-reports: "https://github.com/ocurrent/ocluster/issues"
depends: [
"dune" {>= "3.7"}
"dune" {>= "3.16"}
"ocluster-api" {= version}
"ocluster-worker" {= version}
"ocaml" {>= "4.14.1"}
"ocaml" {>= "4.14"}
"capnp-rpc-lwt" {>= "1.2.3"}
"capnp-rpc-net" {>= "1.2.3"}
"capnp-rpc-unix" {>= "1.2.3"}
"cmdliner" {>= "1.2.0"}
"cmdliner" {>= "1.3.0"}
"conf-libev" {os != "win32"}
"digestif" {>= "0.8"}
"dune-build-info"
"fmt"
"fpath"
"logs"
"lwt" {>= "5.6.1"}
"lwt" {>= "5.7.0"}
"lwt-dllist"
"mirage-crypto" {>= "0.8.5"}
"obuilder" {>= "0.5.1"}
Expand Down