Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
fix: Bump alpine version
& Use ocaml/opam instead of ocaml/opam2
  • Loading branch information
erikmd committed Apr 16, 2021
1 parent a697edf commit 7766698
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions Dockerfile
@@ -1,4 +1,4 @@
FROM ocaml/opam2:alpine-3.7 as compilation
FROM ocaml/opam:alpine-3.13-ocaml-4.05 as compilation
LABEL Description="learn-ocaml building" Vendor="OCamlPro"

WORKDIR learn-ocaml
Expand Down Expand Up @@ -28,7 +28,7 @@ RUN cat /proc/cpuinfo /proc/meminfo
RUN opam install . --destdir /home/opam/install-prefix --locked


FROM alpine:3.7 as client
FROM alpine:3.13 as client

RUN apk update \
&& apk add ncurses-libs libev dumb-init openssl \
Expand All @@ -50,7 +50,7 @@ LABEL org.opencontainers.image.url="https://ocaml-sf.org/"
LABEL org.opencontainers.image.vendor="The OCaml Software Foundation"


FROM alpine:3.7 as program
FROM alpine:3.13 as program

RUN apk update \
&& apk add ncurses-libs libev dumb-init git openssl \
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile.test-client
@@ -1,7 +1,7 @@
# This Dockerfile is useful for testing purposes
# to ensure learn-ocaml-client can be built alone from learn-ocaml-client.opam

FROM ocaml/opam2:alpine-3.7 as compilation
FROM ocaml/opam:alpine-3.13-ocaml-4.05 as compilation
LABEL Description="learn-ocaml building" Vendor="OCamlPro"

WORKDIR learn-ocaml
Expand Down Expand Up @@ -34,7 +34,7 @@ RUN opam install learn-ocaml-client --destdir /home/opam/install-prefix \
&& ls -l /home/opam/install-prefix/bin/learn-ocaml-client


FROM alpine:3.7 as client
FROM alpine:3.13 as client

ARG BUILD_DATE
ARG VCS_BRANCH
Expand Down

0 comments on commit 7766698

Please sign in to comment.