diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index e5fce43f1..e8eb4c299 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -7,6 +7,9 @@ on: pull_request: branches: - '**' + schedule: + # test master every Saturday at 08:00 UTC + - cron: '0 8 * * 6' jobs: build_test_server: diff --git a/.github/workflows/deploy-master.yml b/.github/workflows/deploy-master.yml index 4ba802e03..8bf488427 100644 --- a/.github/workflows/deploy-master.yml +++ b/.github/workflows/deploy-master.yml @@ -4,6 +4,9 @@ on: push: branches: - master + schedule: + # deploy master every Saturday at 08:00 UTC + - cron: '0 8 * * 6' jobs: push_server: name: Push learn-ocaml image to Docker Hub diff --git a/Dockerfile b/Dockerfile index e71e23173..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,10 +28,10 @@ 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 \ + && apk add ncurses-libs libev dumb-init openssl \ && addgroup learn-ocaml \ && adduser learn-ocaml -DG learn-ocaml @@ -50,10 +50,10 @@ 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 \ + && apk add ncurses-libs libev dumb-init git openssl \ && addgroup learn-ocaml \ && adduser learn-ocaml -DG learn-ocaml diff --git a/Dockerfile.test-client b/Dockerfile.test-client index 6e7480ef7..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 @@ -51,7 +51,7 @@ LABEL org.label-schema.build-date="${BUILD_DATE}" \ org.label-schema.schema-version="1.0" RUN apk update \ - && apk add ncurses-libs libev dumb-init \ + && apk add ncurses-libs libev dumb-init openssl \ && addgroup learn-ocaml \ && adduser learn-ocaml -DG learn-ocaml