Skip to content

Commit 5ffd748

Browse files
authored
style: Address warnings in Dockerfiles and GHA workflows (#634)
1 parent 4160e8f commit 5ffd748

File tree

6 files changed

+27
-27
lines changed

6 files changed

+27
-27
lines changed

.github/workflows/deploy-master.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
- name: Prepare
3333
id: prep
3434
run: |
35-
echo "::set-output name=created::$(date -u +'%Y-%m-%dT%H:%M:%SZ')"
35+
echo "created=$(date -u +'%Y-%m-%dT%H:%M:%SZ')" >> $GITHUB_OUTPUT
3636
- name: Push to Docker Hub
3737
# cf. https://github.com/docker/build-push-action#customizing
3838
# and https://github.com/docker/build-push-action/pull/119
@@ -77,7 +77,7 @@ jobs:
7777
- name: Prepare
7878
id: prep
7979
run: |
80-
echo "::set-output name=created::$(date -u +'%Y-%m-%dT%H:%M:%SZ')"
80+
echo "created=$(date -u +'%Y-%m-%dT%H:%M:%SZ')" >> $GITHUB_OUTPUT
8181
- name: Push to Docker Hub
8282
# cf. https://github.com/docker/build-push-action#customizing
8383
# and https://github.com/docker/build-push-action/pull/119
@@ -125,7 +125,7 @@ jobs:
125125
- name: Prepare
126126
id: prep
127127
run: |
128-
echo "::set-output name=created::$(date -u +'%Y-%m-%dT%H:%M:%SZ')"
128+
echo "created=$(date -u +'%Y-%m-%dT%H:%M:%SZ')" >> $GITHUB_OUTPUT
129129
- name: Push to Docker Hub
130130
# cf. https://github.com/docker/build-push-action#customizing
131131
# and https://github.com/docker/build-push-action/pull/119

.github/workflows/release.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ jobs:
9797
runs-on: ubuntu-latest
9898
steps:
9999
- name: Get tag name
100-
run: tag="${{ needs.release-please.outputs.tag_name }}"; echo "::set-output name=tag::${tag#v}"
100+
run: tag="${{ needs.release-please.outputs.tag_name }}"; echo "tag=${tag#v}" >> $GITHUB_OUTPUT
101101
id: tag
102102
- name: Check out the repo
103103
uses: actions/checkout@v4
@@ -118,7 +118,7 @@ jobs:
118118
- name: Prepare
119119
id: prep
120120
run: |
121-
echo "::set-output name=created::$(date -u +'%Y-%m-%dT%H:%M:%SZ')"
121+
echo "created=$(date -u +'%Y-%m-%dT%H:%M:%SZ')" >> $GITHUB_OUTPUT
122122
- name: Push to Docker Hub
123123
# cf. https://github.com/docker/build-push-action#customizing
124124
# and https://github.com/docker/build-push-action/pull/119
@@ -148,7 +148,7 @@ jobs:
148148
runs-on: ubuntu-latest
149149
steps:
150150
- name: Get tag name
151-
run: tag="${{ needs.release-please.outputs.tag_name }}"; echo "::set-output name=tag::${tag#v}"
151+
run: tag="${{ needs.release-please.outputs.tag_name }}"; echo "tag=${tag#v}" >> $GITHUB_OUTPUT
152152
id: tag
153153
- name: Check out the repo
154154
uses: actions/checkout@v4
@@ -169,7 +169,7 @@ jobs:
169169
- name: Prepare
170170
id: prep
171171
run: |
172-
echo "::set-output name=created::$(date -u +'%Y-%m-%dT%H:%M:%SZ')"
172+
echo "created=$(date -u +'%Y-%m-%dT%H:%M:%SZ')" >> $GITHUB_OUTPUT
173173
- name: Push to Docker Hub
174174
# cf. https://github.com/docker/build-push-action#customizing
175175
# and https://github.com/docker/build-push-action/pull/119
@@ -203,7 +203,7 @@ jobs:
203203
runs-on: ubuntu-latest
204204
steps:
205205
- name: Get tag name
206-
run: tag="${{ needs.release-please.outputs.tag_name }}"; echo "::set-output name=tag::${tag#v}"
206+
run: tag="${{ needs.release-please.outputs.tag_name }}"; echo "tag=${tag#v}" >> $GITHUB_OUTPUT
207207
id: tag
208208
- name: Check out the repo
209209
uses: actions/checkout@v4
@@ -224,7 +224,7 @@ jobs:
224224
- name: Prepare
225225
id: prep
226226
run: |
227-
echo "::set-output name=created::$(date -u +'%Y-%m-%dT%H:%M:%SZ')"
227+
echo "created=$(date -u +'%Y-%m-%dT%H:%M:%SZ')" >> $GITHUB_OUTPUT
228228
- name: Push to Docker Hub
229229
# cf. https://github.com/docker/build-push-action#customizing
230230
# and https://github.com/docker/build-push-action/pull/119

Dockerfile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
FROM ocaml/opam:alpine-3.20-ocaml-5.1 as compilation
1+
FROM ocaml/opam:alpine-3.20-ocaml-5.1 AS compilation
22
LABEL Description="learn-ocaml building" Vendor="OCamlPro"
33

44
WORKDIR /home/opam/learn-ocaml
55

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

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

26-
ENV OPAMVERBOSE 1
26+
ENV OPAMVERBOSE=1
2727
RUN cat /proc/cpuinfo /proc/meminfo
2828
RUN opam install . --destdir /home/opam/install-prefix --locked
2929

3030

31-
FROM alpine:3.20 as client
31+
FROM alpine:3.20 AS client
3232

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

4747

48-
FROM alpine:3.20 as program
48+
FROM alpine:3.20 AS program
4949

5050
RUN apk update \
5151
&& apk add ncurses-libs libev dumb-init git openssl lsof \

Dockerfile.test-client

Lines changed: 4 additions & 4 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/opam:alpine-3.20-ocaml-5.1 as compilation
4+
FROM ocaml/opam:alpine-3.20-ocaml-5.1 AS compilation
55
LABEL Description="learn-ocaml building" Vendor="OCamlPro"
66

77
WORKDIR /home/opam/learn-ocaml
@@ -10,7 +10,7 @@ WORKDIR /home/opam/learn-ocaml
1010
COPY learn-ocaml-client.opam learn-ocaml.opam ./
1111
RUN sudo chown -R opam:nogroup .
1212

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

31-
ENV OPAMVERBOSE 1
31+
ENV OPAMVERBOSE=1
3232

3333
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.20 as client
37+
FROM alpine:3.20 AS client
3838

3939
ARG BUILD_DATE
4040
ARG VCS_BRANCH

Dockerfile.test-server

Lines changed: 5 additions & 5 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 can be built alone from learn-ocaml.opam
33

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

77
WORKDIR /home/opam/learn-ocaml
@@ -10,7 +10,7 @@ WORKDIR /home/opam/learn-ocaml
1010
COPY learn-ocaml.opam learn-ocaml-client.opam ./
1111
RUN sudo chown -R opam:nogroup .
1212

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

31-
ENV OPAMVERBOSE 1
31+
ENV OPAMVERBOSE=1
3232

3333
# Run "make detect-libs"
34-
ENV OPAMWITHTEST 1
34+
ENV OPAMWITHTEST=1
3535

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

3939

40-
FROM alpine:3.20 as program
40+
FROM alpine:3.20 AS program
4141

4242
ARG BUILD_DATE
4343
ARG VCS_BRANCH

ci/docker-emacs-learn-ocaml-client/Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@ RUN apk add --no-cache \
1414
&& mkdir -p -v bin \
1515
&& chown -v learn-ocaml:learn-ocaml bin
1616

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

19-
ENV LANG C.UTF-8
20-
# ENV LC_ALL C.UTF-8
21-
# ENV LANGUAGE en_US:en
19+
ENV LANG="C.UTF-8"
20+
# ENV LC_ALL="C.UTF-8"
21+
# ENV LANGUAGE="en_US:en"
2222

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

0 commit comments

Comments
 (0)