Skip to content

Commit

Permalink
Bump OCaml version used in Docker image. (#326)
Browse files Browse the repository at this point in the history
This is required since the update of mirage-crypto (#314).

The deployment job was failing because it needed OCaml >= 4.13.
  • Loading branch information
Zimmi48 authored Oct 28, 2024
2 parents e832e19 + bee4e86 commit 3dd0339
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 7 deletions.
2 changes: 1 addition & 1 deletion bot-components.opam
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ depends: [
"cohttp-lwt" {>= "2.5.4"}
"cohttp-lwt-unix" {>= "2.5.4"}
"lwt_ssl" {>= "1.1.3"}
"ssl" {= "0.5.9"}
"ssl" {>= "0.5.9"}
"stdio" {>= "v0.14.0"}
"ohex" {>= "0.2.0"}
"mirage-crypto" {>= "1.0.0"}
Expand Down
1 change: 0 additions & 1 deletion coq-bot.opam
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ license: "MIT"
homepage: "https://github.com/coq/bot"
bug-reports: "https://github.com/coq/bot/issues"
depends: [
"ocaml" {>= "4.10"}
"dune" {>= "2.2"}
"base" {>= "v0.14.0"}
"lwt" {>= "5.6.0"}
Expand Down
3 changes: 1 addition & 2 deletions dune-project
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
(name coq-bot)
(synopsis "A (Coq Development Team) bot written in OCaml")
(depends
(ocaml (>= 4.10))
(dune (>= 2.2))
(base (>= v0.14.0))
(lwt (>= 5.6.0))
Expand Down Expand Up @@ -40,7 +39,7 @@
(cohttp-lwt (>= 2.5.4))
(cohttp-lwt-unix (>= 2.5.4))
(lwt_ssl (>= 1.1.3))
(ssl (= 0.5.9))
(ssl (>= 0.5.9))
(stdio (>= v0.14.0))
(ohex (>= 0.2.0))
(mirage-crypto (>= 1.0.0))
Expand Down
6 changes: 3 additions & 3 deletions release.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
FROM ocaml/opam2:alpine-3.10-ocaml-4.10 AS builder
FROM ocaml/opam:alpine-3.20-ocaml-5.2 AS builder

WORKDIR /src
COPY coq-bot.opam bot-components.opam ./

# Install the OCaml libraries needed to compile the program
RUN echo 'archive-mirrors: [ "https://opam.ocaml.org/cache" ]' >> ~/.opam/config \
&& opam repository set-url default http://opam.ocaml.org \
&& opam switch 4.10 \
&& opam switch 5.2 \
&& echo 'pre-session-commands: [ "sudo" "apk" "add" depexts ]' >> ~/.opam/config \
&& OPAMSOLVERTIMEOUT=300 opam install --deps-only .

Expand All @@ -19,7 +19,7 @@ RUN opam install . --destdir /src/opam-install
RUN OPAMSOLVERTIMEOUT=300 opam depext -ln coq-bot > /src/depexts-coq-bot


FROM alpine:3.10 AS app
FROM alpine:3.20 AS app

WORKDIR /app

Expand Down

0 comments on commit 3dd0339

Please sign in to comment.