Skip to content

Commit 4098351

Browse files
MisterDAMisterDA
committed
Dockerfile & dependencies updates
1 parent ea9cc6e commit 4098351

File tree

10 files changed

+28
-25
lines changed

10 files changed

+28
-25
lines changed

‎Dockerfile‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
FROM ocaml/opam:debian-12-ocaml-4.14@sha256:45b04e2a4c933c57549382045dfac12cb7e872cace0456f92f4b022066e48111 AS build
2-
RUN sudo ln -f /usr/bin/opam-2.1 /usr/bin/opam && opam init --reinit -ni
1+
# syntax=docker/dockerfile:1
2+
FROM ocaml/opam:debian-12-ocaml-4.14@sha256:be38063c43f00b0627de62144f24dc8c9929504f0db4774343d7bffc62777073 AS build
3+
RUN sudo ln -f /usr/bin/opam-2.2 /usr/bin/opam && opam init --reinit -ni
34
RUN sudo apt-get update && sudo apt-get install libcapnp-dev libffi-dev libev-dev capnproto m4 pkg-config libsqlite3-dev libgmp-dev graphviz -y --no-install-recommends
4-
RUN cd ~/opam-repository && git fetch -q origin master && git reset --hard cf93548ddc4f36b87b006f4858fac7ae73ccaa0f && opam update
5-
COPY --chown=opam \
5+
RUN cd ~/opam-repository && git fetch -q origin master && git reset --hard 1b4da5019e5ea60af76c94aacc672a7e9659a832 && opam update
6+
COPY --link --chown=opam \
67
ocurrent/current_docker.opam \
78
ocurrent/current_github.opam \
89
ocurrent/current_git.opam \
@@ -11,16 +12,16 @@ COPY --chown=opam \
1112
ocurrent/current_slack.opam \
1213
ocurrent/current_web.opam \
1314
/src/ocurrent/
14-
COPY --chown=opam \
15+
COPY --link --chown=opam \
1516
ocluster/ocluster-api.opam \
1617
ocluster/current_ocluster.opam \
1718
/src/ocluster/
18-
COPY --chown=opam \
19+
COPY --link --chown=opam \
1920
solver-service/solver-service-api.opam \
2021
solver-service/solver-service.opam \
2122
solver-service/solver-worker.opam \
2223
/src/solver-service/
23-
COPY --chown=opam \
24+
COPY --link --chown=opam \
2425
ocaml-dockerfile/dockerfile*.opam \
2526
/src/ocaml-dockerfile/
2627
WORKDIR /src
@@ -38,9 +39,9 @@ RUN opam pin add -yn current_docker.dev "./ocurrent" && \
3839
opam pin add -yn solver-service.dev "./solver-service" && \
3940
opam pin add -yn solver-worker.dev "./solver-service" && \
4041
opam pin add -yn ocluster-api.dev "./ocluster"
41-
COPY --chown=opam ocaml-ci.opam ocaml-ci-service.opam ocaml-ci-api.opam /src/
42+
COPY --link --chown=opam ocaml-ci.opam ocaml-ci-service.opam ocaml-ci-api.opam /src/
4243
RUN opam install -y --deps-only .
43-
ADD --chown=opam . .
44+
ADD --link --chown=opam . .
4445
RUN opam exec -- dune build ./_build/install/default/bin/ocaml-ci-service
4546

4647
FROM debian:12
@@ -53,7 +54,7 @@ ENTRYPOINT ["dumb-init", "/usr/local/bin/ocaml-ci-service"]
5354
ENV OCAMLRUNPARAM=a=2
5455
# Enable experimental for docker manifest support
5556
ENV DOCKER_CLI_EXPERIMENTAL=enabled
56-
COPY --from=build /src/_build/install/default/bin/ocaml-ci-service /src/_build/install/default/bin/solver-service /usr/local/bin/
57+
COPY --link --from=build /src/_build/install/default/bin/ocaml-ci-service /src/_build/install/default/bin/solver-service /usr/local/bin/
5758
# Create migration directory
5859
RUN mkdir -p /migrations
59-
COPY --from=build /src/migrations /migrations
60+
COPY --link --from=build /src/migrations /migrations

‎Dockerfile.gitlab‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1-
FROM ocaml/opam:debian-12-ocaml-4.14@sha256:45b04e2a4c933c57549382045dfac12cb7e872cace0456f92f4b022066e48111 AS build
2-
RUN sudo ln -f /usr/bin/opam-2.1 /usr/bin/opam && opam init --reinit -ni
1+
# syntax=docker/dockerfile:1
2+
FROM ocaml/opam:debian-12-ocaml-4.14@sha256:be38063c43f00b0627de62144f24dc8c9929504f0db4774343d7bffc62777073 AS build
3+
RUN sudo ln -f /usr/bin/opam-2.2 /usr/bin/opam && opam init --reinit -ni
34
RUN sudo apt-get update && sudo apt-get install libev-dev capnproto m4 pkg-config libsqlite3-dev libgmp-dev graphviz -y --no-install-recommends
4-
RUN cd ~/opam-repository && git fetch -q origin master && git reset --hard cf93548ddc4f36b87b006f4858fac7ae73ccaa0f && opam update
5+
RUN cd ~/opam-repository && git fetch -q origin master && git reset --hard 1b4da5019e5ea60af76c94aacc672a7e9659a832 && opam update
56
COPY --chown=opam \
67
ocurrent/current_docker.opam \
78
ocurrent/current_github.opam \

‎Dockerfile.web‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1-
FROM ocaml/opam:debian-12-ocaml-4.14@sha256:45b04e2a4c933c57549382045dfac12cb7e872cace0456f92f4b022066e48111 AS build
2-
RUN sudo ln -f /usr/bin/opam-2.1 /usr/bin/opam && opam init --reinit -ni
1+
# syntax=docker/dockerfile:1
2+
FROM ocaml/opam:debian-12-ocaml-4.14@sha256:be38063c43f00b0627de62144f24dc8c9929504f0db4774343d7bffc62777073 AS build
3+
RUN sudo ln -f /usr/bin/opam-2.2 /usr/bin/opam && opam init --reinit -ni
34
RUN sudo apt-get update && sudo apt-get install libev-dev capnproto m4 pkg-config libgmp-dev libssl-dev libffi-dev libsqlite3-dev -y --no-install-recommends
4-
RUN cd ~/opam-repository && git fetch -q origin master && git reset --hard cf93548ddc4f36b87b006f4858fac7ae73ccaa0f && opam update
5+
RUN cd ~/opam-repository && git fetch -q origin master && git reset --hard 1b4da5019e5ea60af76c94aacc672a7e9659a832 && opam update
56
COPY --chown=opam \
67
ocurrent/current_rpc.opam \
78
/src/ocurrent/

‎dune-project‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,10 +135,10 @@
135135
(ansi (>= 0.6.0))
136136
(capnp-rpc-unix (>= 1.2))
137137
(crunch (and (>= 3.2.0) :build))
138-
(dream (= 1.0.0~alpha5))
138+
(dream (= 1.0.0~alpha6))
139139
(fmt (>= 0.8.9))
140140
(logs (>= 0.7.0))
141-
(lwt (>= 5.6.1))
141+
(lwt (>= 5.7.0))
142142
(prometheus-app (>= 1.2))
143143
(ppx_deriving_yojson (>= 3.7))
144144
(yojson (>= 2.1))

‎ocaml-ci-web.opam‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,5 +44,5 @@ build: [
4444
]
4545
dev-repo: "git+https://github.com/ocurrent/ocaml-ci.git"
4646
pin-depends: [
47-
["tailwindcss.dev" "https://github.com/tmattio/opam-tailwindcss/archive/3e60fc32bbcf82525999d83ad0f395e16107026b.tar.gz"]
47+
["tailwindcss.dev" "https://github.com/tmattio/opam-tailwindcss/archive/e5bb6361a50c7cc5cad802311e609336583ca08f.tar.gz"]
4848
]

‎ocaml-ci-web.opam.template‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
pin-depends: [
2-
["tailwindcss.dev" "https://github.com/tmattio/opam-tailwindcss/archive/3e60fc32bbcf82525999d83ad0f395e16107026b.tar.gz"]
2+
["tailwindcss.dev" "https://github.com/tmattio/opam-tailwindcss/archive/e5bb6361a50c7cc5cad802311e609336583ca08f.tar.gz"]
33
]

‎ocaml-dockerfile‎

‎ocluster‎

‎ocurrent‎

‎solver-service‎

Submodule solver-service updated 111 files

0 commit comments

Comments
 (0)