Skip to content

Commit 3dd0339

Browse files
authored
Bump OCaml version used in Docker image. (#326)
This is required since the update of mirage-crypto (#314). The deployment job was failing because it needed OCaml >= 4.13.
2 parents e832e19 + bee4e86 commit 3dd0339

File tree

4 files changed

+5
-7
lines changed

4 files changed

+5
-7
lines changed

bot-components.opam

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ depends: [
1313
"cohttp-lwt" {>= "2.5.4"}
1414
"cohttp-lwt-unix" {>= "2.5.4"}
1515
"lwt_ssl" {>= "1.1.3"}
16-
"ssl" {= "0.5.9"}
16+
"ssl" {>= "0.5.9"}
1717
"stdio" {>= "v0.14.0"}
1818
"ohex" {>= "0.2.0"}
1919
"mirage-crypto" {>= "1.0.0"}

coq-bot.opam

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ license: "MIT"
77
homepage: "https://github.com/coq/bot"
88
bug-reports: "https://github.com/coq/bot/issues"
99
depends: [
10-
"ocaml" {>= "4.10"}
1110
"dune" {>= "2.2"}
1211
"base" {>= "v0.14.0"}
1312
"lwt" {>= "5.6.0"}

dune-project

+1-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
(name coq-bot)
1313
(synopsis "A (Coq Development Team) bot written in OCaml")
1414
(depends
15-
(ocaml (>= 4.10))
1615
(dune (>= 2.2))
1716
(base (>= v0.14.0))
1817
(lwt (>= 5.6.0))
@@ -40,7 +39,7 @@
4039
(cohttp-lwt (>= 2.5.4))
4140
(cohttp-lwt-unix (>= 2.5.4))
4241
(lwt_ssl (>= 1.1.3))
43-
(ssl (= 0.5.9))
42+
(ssl (>= 0.5.9))
4443
(stdio (>= v0.14.0))
4544
(ohex (>= 0.2.0))
4645
(mirage-crypto (>= 1.0.0))

release.Dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
FROM ocaml/opam2:alpine-3.10-ocaml-4.10 AS builder
1+
FROM ocaml/opam:alpine-3.20-ocaml-5.2 AS builder
22

33
WORKDIR /src
44
COPY coq-bot.opam bot-components.opam ./
55

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

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

2121

22-
FROM alpine:3.10 AS app
22+
FROM alpine:3.20 AS app
2323

2424
WORKDIR /app
2525

0 commit comments

Comments
 (0)