Skip to content

Commit

Permalink
Merge pull request #385 from pfitaxel/fix-alpine-deps
Browse files Browse the repository at this point in the history
fix: runtime error in docker packaging
  • Loading branch information
erikmd committed Apr 16, 2021
2 parents 61941cd + 63903f2 commit 2269b3b
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 8 deletions.
3 changes: 3 additions & 0 deletions .github/workflows/build-and-test.yml
Expand Up @@ -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:
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/deploy-master.yml
Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 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,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

Expand All @@ -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

Expand Down
6 changes: 3 additions & 3 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 All @@ -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

Expand Down

0 comments on commit 2269b3b

Please sign in to comment.