Skip to content

Commit 2269b3b

Browse files
authored
Merge pull request #385 from pfitaxel/fix-alpine-deps
fix: runtime error in docker packaging
2 parents 61941cd + 63903f2 commit 2269b3b

File tree

4 files changed

+14
-8
lines changed

4 files changed

+14
-8
lines changed

.github/workflows/build-and-test.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@ on:
77
pull_request:
88
branches:
99
- '**'
10+
schedule:
11+
# test master every Saturday at 08:00 UTC
12+
- cron: '0 8 * * 6'
1013

1114
jobs:
1215
build_test_server:

.github/workflows/deploy-master.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ on:
44
push:
55
branches:
66
- master
7+
schedule:
8+
# deploy master every Saturday at 08:00 UTC
9+
- cron: '0 8 * * 6'
710
jobs:
811
push_server:
912
name: Push learn-ocaml image to Docker Hub

Dockerfile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ocaml/opam2:alpine-3.7 as compilation
1+
FROM ocaml/opam:alpine-3.13-ocaml-4.05 as compilation
22
LABEL Description="learn-ocaml building" Vendor="OCamlPro"
33

44
WORKDIR learn-ocaml
@@ -28,10 +28,10 @@ RUN cat /proc/cpuinfo /proc/meminfo
2828
RUN opam install . --destdir /home/opam/install-prefix --locked
2929

3030

31-
FROM alpine:3.7 as client
31+
FROM alpine:3.13 as client
3232

3333
RUN apk update \
34-
&& apk add ncurses-libs libev dumb-init \
34+
&& apk add ncurses-libs libev dumb-init openssl \
3535
&& addgroup learn-ocaml \
3636
&& adduser learn-ocaml -DG learn-ocaml
3737

@@ -50,10 +50,10 @@ LABEL org.opencontainers.image.url="https://ocaml-sf.org/"
5050
LABEL org.opencontainers.image.vendor="The OCaml Software Foundation"
5151

5252

53-
FROM alpine:3.7 as program
53+
FROM alpine:3.13 as program
5454

5555
RUN apk update \
56-
&& apk add ncurses-libs libev dumb-init git \
56+
&& apk add ncurses-libs libev dumb-init git openssl \
5757
&& addgroup learn-ocaml \
5858
&& adduser learn-ocaml -DG learn-ocaml
5959

Dockerfile.test-client

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# This Dockerfile is useful for testing purposes
22
# to ensure learn-ocaml-client can be built alone from learn-ocaml-client.opam
33

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

77
WORKDIR learn-ocaml
@@ -34,7 +34,7 @@ RUN opam install learn-ocaml-client --destdir /home/opam/install-prefix \
3434
&& ls -l /home/opam/install-prefix/bin/learn-ocaml-client
3535

3636

37-
FROM alpine:3.7 as client
37+
FROM alpine:3.13 as client
3838

3939
ARG BUILD_DATE
4040
ARG VCS_BRANCH
@@ -51,7 +51,7 @@ LABEL org.label-schema.build-date="${BUILD_DATE}" \
5151
org.label-schema.schema-version="1.0"
5252

5353
RUN apk update \
54-
&& apk add ncurses-libs libev dumb-init \
54+
&& apk add ncurses-libs libev dumb-init openssl \
5555
&& addgroup learn-ocaml \
5656
&& adduser learn-ocaml -DG learn-ocaml
5757

0 commit comments

Comments
 (0)