Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/deploy-master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
- name: Prepare
id: prep
run: |
echo "::set-output name=created::$(date -u +'%Y-%m-%dT%H:%M:%SZ')"
echo "created=$(date -u +'%Y-%m-%dT%H:%M:%SZ')" >> $GITHUB_OUTPUT
- name: Push to Docker Hub
# cf. https://github.com/docker/build-push-action#customizing
# and https://github.com/docker/build-push-action/pull/119
Expand Down Expand Up @@ -77,7 +77,7 @@ jobs:
- name: Prepare
id: prep
run: |
echo "::set-output name=created::$(date -u +'%Y-%m-%dT%H:%M:%SZ')"
echo "created=$(date -u +'%Y-%m-%dT%H:%M:%SZ')" >> $GITHUB_OUTPUT
- name: Push to Docker Hub
# cf. https://github.com/docker/build-push-action#customizing
# and https://github.com/docker/build-push-action/pull/119
Expand Down Expand Up @@ -125,7 +125,7 @@ jobs:
- name: Prepare
id: prep
run: |
echo "::set-output name=created::$(date -u +'%Y-%m-%dT%H:%M:%SZ')"
echo "created=$(date -u +'%Y-%m-%dT%H:%M:%SZ')" >> $GITHUB_OUTPUT
- name: Push to Docker Hub
# cf. https://github.com/docker/build-push-action#customizing
# and https://github.com/docker/build-push-action/pull/119
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Get tag name
run: tag="${{ needs.release-please.outputs.tag_name }}"; echo "::set-output name=tag::${tag#v}"
run: tag="${{ needs.release-please.outputs.tag_name }}"; echo "tag=${tag#v}" >> $GITHUB_OUTPUT
id: tag
- name: Check out the repo
uses: actions/checkout@v4
Expand All @@ -118,7 +118,7 @@ jobs:
- name: Prepare
id: prep
run: |
echo "::set-output name=created::$(date -u +'%Y-%m-%dT%H:%M:%SZ')"
echo "created=$(date -u +'%Y-%m-%dT%H:%M:%SZ')" >> $GITHUB_OUTPUT
- name: Push to Docker Hub
# cf. https://github.com/docker/build-push-action#customizing
# and https://github.com/docker/build-push-action/pull/119
Expand Down Expand Up @@ -148,7 +148,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Get tag name
run: tag="${{ needs.release-please.outputs.tag_name }}"; echo "::set-output name=tag::${tag#v}"
run: tag="${{ needs.release-please.outputs.tag_name }}"; echo "tag=${tag#v}" >> $GITHUB_OUTPUT
id: tag
- name: Check out the repo
uses: actions/checkout@v4
Expand All @@ -169,7 +169,7 @@ jobs:
- name: Prepare
id: prep
run: |
echo "::set-output name=created::$(date -u +'%Y-%m-%dT%H:%M:%SZ')"
echo "created=$(date -u +'%Y-%m-%dT%H:%M:%SZ')" >> $GITHUB_OUTPUT
- name: Push to Docker Hub
# cf. https://github.com/docker/build-push-action#customizing
# and https://github.com/docker/build-push-action/pull/119
Expand Down Expand Up @@ -203,7 +203,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Get tag name
run: tag="${{ needs.release-please.outputs.tag_name }}"; echo "::set-output name=tag::${tag#v}"
run: tag="${{ needs.release-please.outputs.tag_name }}"; echo "tag=${tag#v}" >> $GITHUB_OUTPUT
id: tag
- name: Check out the repo
uses: actions/checkout@v4
Expand All @@ -224,7 +224,7 @@ jobs:
- name: Prepare
id: prep
run: |
echo "::set-output name=created::$(date -u +'%Y-%m-%dT%H:%M:%SZ')"
echo "created=$(date -u +'%Y-%m-%dT%H:%M:%SZ')" >> $GITHUB_OUTPUT
- name: Push to Docker Hub
# cf. https://github.com/docker/build-push-action#customizing
# and https://github.com/docker/build-push-action/pull/119
Expand Down
10 changes: 5 additions & 5 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
FROM ocaml/opam:alpine-3.20-ocaml-5.1 as compilation
FROM ocaml/opam:alpine-3.20-ocaml-5.1 AS compilation
LABEL Description="learn-ocaml building" Vendor="OCamlPro"

WORKDIR /home/opam/learn-ocaml

COPY learn-ocaml.opam learn-ocaml.opam.locked learn-ocaml-client.opam learn-ocaml-client.opam.locked ./
RUN sudo chown -R opam:nogroup .

ENV OPAMYES true
ENV OPAMYES=true
RUN echo 'archive-mirrors: [ "https://opam.ocaml.org/cache" ]' >> ~/.opam/config \
&& opam repository set-url default http://opam.ocaml.org \
&& opam switch 5.1 \
Expand All @@ -23,12 +23,12 @@ COPY dune-project dune-project
COPY dune dune
RUN sudo chown -R opam:nogroup .

ENV OPAMVERBOSE 1
ENV OPAMVERBOSE=1
RUN cat /proc/cpuinfo /proc/meminfo
RUN opam install . --destdir /home/opam/install-prefix --locked


FROM alpine:3.20 as client
FROM alpine:3.20 AS client

RUN apk update \
&& apk add ncurses-libs libev dumb-init libssl3 libcrypto3 \
Expand All @@ -45,7 +45,7 @@ COPY --from=compilation /home/opam/install-prefix/bin/learn-ocaml-client /usr/bi
ENTRYPOINT ["dumb-init","/usr/bin/learn-ocaml-client"]


FROM alpine:3.20 as program
FROM alpine:3.20 AS program

RUN apk update \
&& apk add ncurses-libs libev dumb-init git openssl lsof \
Expand Down
8 changes: 4 additions & 4 deletions Dockerfile.test-client
Original file line number Diff line number Diff line change
@@ -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/opam:alpine-3.20-ocaml-5.1 as compilation
FROM ocaml/opam:alpine-3.20-ocaml-5.1 AS compilation
LABEL Description="learn-ocaml building" Vendor="OCamlPro"

WORKDIR /home/opam/learn-ocaml
Expand All @@ -10,7 +10,7 @@ WORKDIR /home/opam/learn-ocaml
COPY learn-ocaml-client.opam learn-ocaml.opam ./
RUN sudo chown -R opam:nogroup .

ENV OPAMYES true
ENV OPAMYES=true
RUN echo 'archive-mirrors: [ "https://opam.ocaml.org/cache" ]' >> ~/.opam/config \
&& opam repository set-url default http://opam.ocaml.org \
&& opam switch 5.1 \
Expand All @@ -28,13 +28,13 @@ COPY dune-project dune-project
COPY dune dune
RUN sudo chown -R opam:nogroup .

ENV OPAMVERBOSE 1
ENV OPAMVERBOSE=1

RUN opam install learn-ocaml-client --destdir /home/opam/install-prefix \
&& ls -l /home/opam/install-prefix/bin/learn-ocaml-client


FROM alpine:3.20 as client
FROM alpine:3.20 AS client

ARG BUILD_DATE
ARG VCS_BRANCH
Expand Down
10 changes: 5 additions & 5 deletions Dockerfile.test-server
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# This Dockerfile is useful for testing purposes
# to ensure learn-ocaml can be built alone from learn-ocaml.opam

FROM ocaml/opam:alpine-3.20-ocaml-5.1 as compilation
FROM ocaml/opam:alpine-3.20-ocaml-5.1 AS compilation
LABEL Description="learn-ocaml building" Vendor="OCamlPro"

WORKDIR /home/opam/learn-ocaml
Expand All @@ -10,7 +10,7 @@ WORKDIR /home/opam/learn-ocaml
COPY learn-ocaml.opam learn-ocaml-client.opam ./
RUN sudo chown -R opam:nogroup .

ENV OPAMYES true
ENV OPAMYES=true
RUN echo 'archive-mirrors: [ "https://opam.ocaml.org/cache" ]' >> ~/.opam/config \
&& opam repository set-url default http://opam.ocaml.org \
&& opam switch 5.1 \
Expand All @@ -28,16 +28,16 @@ COPY dune-project dune-project
COPY dune dune
RUN sudo chown -R opam:nogroup .

ENV OPAMVERBOSE 1
ENV OPAMVERBOSE=1

# Run "make detect-libs"
ENV OPAMWITHTEST 1
ENV OPAMWITHTEST=1

RUN opam install learn-ocaml --destdir /home/opam/install-prefix \
&& ls -l /home/opam/install-prefix/bin/learn-ocaml


FROM alpine:3.20 as program
FROM alpine:3.20 AS program

ARG BUILD_DATE
ARG VCS_BRANCH
Expand Down
8 changes: 4 additions & 4 deletions ci/docker-emacs-learn-ocaml-client/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ RUN apk add --no-cache \
&& mkdir -p -v bin \
&& chown -v learn-ocaml:learn-ocaml bin

ENV PATH /home/learn-ocaml/bin:${PATH}
ENV PATH="/home/learn-ocaml/bin:${PATH}"

ENV LANG C.UTF-8
# ENV LC_ALL C.UTF-8
# ENV LANGUAGE en_US:en
ENV LANG="C.UTF-8"
# ENV LC_ALL="C.UTF-8"
# ENV LANGUAGE="en_US:en"

COPY --chown=learn-ocaml:learn-ocaml .emacs .emacs

Expand Down
Loading