From 7766698707759739f3893173aa3b876540c344c4 Mon Sep 17 00:00:00 2001 From: Erik Martin-Dorel Date: Fri, 16 Apr 2021 09:55:16 +0200 Subject: [PATCH] fix: Bump alpine version & Use ocaml/opam instead of ocaml/opam2 --- Dockerfile | 6 +++--- Dockerfile.test-client | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 05529e16f..bd280f5ad 100644 --- a/Dockerfile +++ b/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 @@ -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 \ @@ -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 \ diff --git a/Dockerfile.test-client b/Dockerfile.test-client index 2d8a757da..ee7c49a13 100644 --- a/Dockerfile.test-client +++ b/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 @@ -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