Skip to content

Commit 80bcc56

Browse files
mtelversmtelvers
authored
Merge pull request #305 from mtelvers/5-3-beta1
Fix Fedora 41 dnf command line
2 parents 6f292f5 + 3380158 commit 80bcc56

3 files changed

Lines changed: 25 additions & 5 deletions

File tree

‎builds.expected‎

Lines changed: 22 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10753,7 +10753,7 @@ fedora-41/arm64
1075310753
LABEL distro_style="rpm"
1075410754
RUN yum --version || dnf install -y yum
1075510755
RUN yum update -y
10756-
RUN yum groupinstall -y "C Development Tools and Libraries" && yum clean packages
10756+
RUN yum group install -y "c-development" && yum clean packages
1075710757
RUN yum install -y git patch unzip which tar curl xz libcap-devel openssl sudo bzip2 && yum clean packages
1075810758
RUN git config --global user.email "docker@example.com"
1075910759
RUN git config --global user.name "Docker"
@@ -10767,7 +10767,7 @@ fedora-41/arm64
1076710767
FROM fedora:41
1076810768
RUN yum --version || dnf install -y yum
1076910769
RUN yum update -y
10770-
RUN yum groupinstall -y "C Development Tools and Libraries" && yum clean packages
10770+
RUN yum group install -y "c-development" && yum clean packages
1077110771
RUN yum install -y sudo passwd bzip2 unzip patch rsync nano gcc-c++ git tar curl xz libX11-devel which m4 diffutils findutils bubblewrap && yum clean packages
1077210772
COPY --from=0 [ "/usr/bin/opam-2.0", "/usr/bin/opam-2.0" ]
1077310773
RUN ln /usr/bin/opam-2.0 /usr/bin/opam
@@ -10831,7 +10831,7 @@ fedora-41/amd64
1083110831
LABEL distro_style="rpm"
1083210832
RUN yum --version || dnf install -y yum
1083310833
RUN yum update -y
10834-
RUN yum groupinstall -y "C Development Tools and Libraries" && yum clean packages
10834+
RUN yum group install -y "c-development" && yum clean packages
1083510835
RUN yum install -y git patch unzip which tar curl xz libcap-devel openssl sudo bzip2 && yum clean packages
1083610836
RUN git config --global user.email "docker@example.com"
1083710837
RUN git config --global user.name "Docker"
@@ -10845,7 +10845,7 @@ fedora-41/amd64
1084510845
FROM fedora:41
1084610846
RUN yum --version || dnf install -y yum
1084710847
RUN yum update -y
10848-
RUN yum groupinstall -y "C Development Tools and Libraries" && yum clean packages
10848+
RUN yum group install -y "c-development" && yum clean packages
1084910849
RUN yum install -y sudo passwd bzip2 unzip patch rsync nano gcc-c++ git tar curl xz libX11-devel which m4 diffutils findutils bubblewrap && yum clean packages
1085010850
COPY --from=0 [ "/usr/bin/opam-2.0", "/usr/bin/opam-2.0" ]
1085110851
RUN ln /usr/bin/opam-2.0 /usr/bin/opam
@@ -10906,6 +10906,7 @@ ocurrent/opam-staging:fedora-41-opam-arm64, ocurrent/opam-staging:fedora-41-opam
1090610906
# syntax=docker/dockerfile:1
1090710907

1090810908
FROM ocurrent/opam-staging:fedora-41-opam-amd64
10909+
RUN opam repo add ocaml-patches-overlay git+https://github.com/ocurrent/opam-repository#patches --set-default
1090910910
ENV OPAMYES="1" OPAMCONFIRMLEVEL="unsafe-yes" OPAMERRLOGLEN="0" OPAMPRECISETRACKING="1"
1091010911
RUN opam switch create 4.02 --packages=ocaml-base-compiler.4.02.3
1091110912
RUN opam pin add -k version ocaml-base-compiler 4.02.3
@@ -10921,6 +10922,7 @@ ocurrent/opam-staging:fedora-41-ocaml-4.02-amd64 -> ocaml/opam:fedora-ocaml-4.02
1092110922
# syntax=docker/dockerfile:1
1092210923

1092310924
FROM ocurrent/opam-staging:fedora-41-opam-amd64
10925+
RUN opam repo add ocaml-patches-overlay git+https://github.com/ocurrent/opam-repository#patches --set-default
1092410926
ENV OPAMYES="1" OPAMCONFIRMLEVEL="unsafe-yes" OPAMERRLOGLEN="0" OPAMPRECISETRACKING="1"
1092510927
RUN opam switch create 4.03 --packages=ocaml-base-compiler.4.03.0
1092610928
RUN opam pin add -k version ocaml-base-compiler 4.03.0
@@ -10936,6 +10938,7 @@ ocurrent/opam-staging:fedora-41-ocaml-4.03-amd64 -> ocaml/opam:fedora-ocaml-4.03
1093610938
# syntax=docker/dockerfile:1
1093710939

1093810940
FROM ocurrent/opam-staging:fedora-41-opam-amd64
10941+
RUN opam repo add ocaml-patches-overlay git+https://github.com/ocurrent/opam-repository#patches --set-default
1093910942
ENV OPAMYES="1" OPAMCONFIRMLEVEL="unsafe-yes" OPAMERRLOGLEN="0" OPAMPRECISETRACKING="1"
1094010943
RUN opam switch create 4.04 --packages=ocaml-base-compiler.4.04.2
1094110944
RUN opam pin add -k version ocaml-base-compiler 4.04.2
@@ -10951,6 +10954,7 @@ ocurrent/opam-staging:fedora-41-ocaml-4.04-amd64 -> ocaml/opam:fedora-ocaml-4.04
1095110954
# syntax=docker/dockerfile:1
1095210955

1095310956
FROM ocurrent/opam-staging:fedora-41-opam-amd64
10957+
RUN opam repo add ocaml-patches-overlay git+https://github.com/ocurrent/opam-repository#patches --set-default
1095410958
ENV OPAMYES="1" OPAMCONFIRMLEVEL="unsafe-yes" OPAMERRLOGLEN="0" OPAMPRECISETRACKING="1"
1095510959
RUN opam switch create 4.05 --packages=ocaml-base-compiler.4.05.0
1095610960
RUN opam pin add -k version ocaml-base-compiler 4.05.0
@@ -10966,6 +10970,7 @@ ocurrent/opam-staging:fedora-41-ocaml-4.05-amd64 -> ocaml/opam:fedora-ocaml-4.05
1096610970
# syntax=docker/dockerfile:1
1096710971

1096810972
FROM ocurrent/opam-staging:fedora-41-opam-amd64
10973+
RUN opam repo add ocaml-patches-overlay git+https://github.com/ocurrent/opam-repository#patches --set-default
1096910974
ENV OPAMYES="1" OPAMCONFIRMLEVEL="unsafe-yes" OPAMERRLOGLEN="0" OPAMPRECISETRACKING="1"
1097010975
RUN opam switch create 4.06 --packages=ocaml-base-compiler.4.06.1
1097110976
RUN opam pin add -k version ocaml-base-compiler 4.06.1
@@ -10981,6 +10986,7 @@ ocurrent/opam-staging:fedora-41-ocaml-4.06-amd64 -> ocaml/opam:fedora-ocaml-4.06
1098110986
# syntax=docker/dockerfile:1
1098210987

1098310988
FROM ocurrent/opam-staging:fedora-41-opam-amd64
10989+
RUN opam repo add ocaml-patches-overlay git+https://github.com/ocurrent/opam-repository#patches --set-default
1098410990
ENV OPAMYES="1" OPAMCONFIRMLEVEL="unsafe-yes" OPAMERRLOGLEN="0" OPAMPRECISETRACKING="1"
1098510991
RUN opam switch create 4.07 --packages=ocaml-base-compiler.4.07.1
1098610992
RUN opam pin add -k version ocaml-base-compiler 4.07.1
@@ -18021,6 +18027,7 @@ ocurrent/opam-staging:ubuntu-24.10-opam-s390x, ocurrent/opam-staging:ubuntu-24.1
1802118027
# syntax=docker/dockerfile:1
1802218028

1802318029
FROM ocurrent/opam-staging:ubuntu-24.10-opam-amd64
18030+
RUN opam repo add ocaml-patches-overlay git+https://github.com/ocurrent/opam-repository#patches --set-default
1802418031
ENV OPAMYES="1" OPAMCONFIRMLEVEL="unsafe-yes" OPAMERRLOGLEN="0" OPAMPRECISETRACKING="1"
1802518032
RUN opam switch create 4.02 --packages=ocaml-base-compiler.4.02.3
1802618033
RUN opam pin add -k version ocaml-base-compiler 4.02.3
@@ -18036,6 +18043,7 @@ ocurrent/opam-staging:ubuntu-24.10-ocaml-4.02-amd64 -> ocaml/opam:ubuntu-ocaml-4
1803618043
# syntax=docker/dockerfile:1
1803718044

1803818045
FROM ocurrent/opam-staging:ubuntu-24.10-opam-amd64
18046+
RUN opam repo add ocaml-patches-overlay git+https://github.com/ocurrent/opam-repository#patches --set-default
1803918047
ENV OPAMYES="1" OPAMCONFIRMLEVEL="unsafe-yes" OPAMERRLOGLEN="0" OPAMPRECISETRACKING="1"
1804018048
RUN opam switch create 4.03 --packages=ocaml-base-compiler.4.03.0
1804118049
RUN opam pin add -k version ocaml-base-compiler 4.03.0
@@ -18051,6 +18059,7 @@ ocurrent/opam-staging:ubuntu-24.10-ocaml-4.03-amd64 -> ocaml/opam:ubuntu-ocaml-4
1805118059
# syntax=docker/dockerfile:1
1805218060

1805318061
FROM ocurrent/opam-staging:ubuntu-24.10-opam-amd64
18062+
RUN opam repo add ocaml-patches-overlay git+https://github.com/ocurrent/opam-repository#patches --set-default
1805418063
ENV OPAMYES="1" OPAMCONFIRMLEVEL="unsafe-yes" OPAMERRLOGLEN="0" OPAMPRECISETRACKING="1"
1805518064
RUN opam switch create 4.04 --packages=ocaml-base-compiler.4.04.2
1805618065
RUN opam pin add -k version ocaml-base-compiler 4.04.2
@@ -18066,6 +18075,7 @@ ocurrent/opam-staging:ubuntu-24.10-ocaml-4.04-amd64 -> ocaml/opam:ubuntu-ocaml-4
1806618075
# syntax=docker/dockerfile:1
1806718076

1806818077
FROM ocurrent/opam-staging:ubuntu-24.10-opam-amd64
18078+
RUN opam repo add ocaml-patches-overlay git+https://github.com/ocurrent/opam-repository#patches --set-default
1806918079
ENV OPAMYES="1" OPAMCONFIRMLEVEL="unsafe-yes" OPAMERRLOGLEN="0" OPAMPRECISETRACKING="1"
1807018080
RUN opam switch create 4.05 --packages=ocaml-base-compiler.4.05.0
1807118081
RUN opam pin add -k version ocaml-base-compiler 4.05.0
@@ -18081,6 +18091,7 @@ ocurrent/opam-staging:ubuntu-24.10-ocaml-4.05-amd64 -> ocaml/opam:ubuntu-ocaml-4
1808118091
# syntax=docker/dockerfile:1
1808218092

1808318093
FROM ocurrent/opam-staging:ubuntu-24.10-opam-s390x
18094+
RUN opam repo add ocaml-patches-overlay git+https://github.com/ocurrent/opam-repository#patches --set-default
1808418095
ENV OPAMYES="1" OPAMCONFIRMLEVEL="unsafe-yes" OPAMERRLOGLEN="0" OPAMPRECISETRACKING="1"
1808518096
RUN opam switch create 4.06 --packages=ocaml-base-compiler.4.06.1
1808618097
RUN opam pin add -k version ocaml-base-compiler 4.06.1
@@ -18094,6 +18105,7 @@ ocurrent/opam-staging:ubuntu-24.10-ocaml-4.05-amd64 -> ocaml/opam:ubuntu-ocaml-4
1809418105
# syntax=docker/dockerfile:1
1809518106

1809618107
FROM ocurrent/opam-staging:ubuntu-24.10-opam-ppc64le
18108+
RUN opam repo add ocaml-patches-overlay git+https://github.com/ocurrent/opam-repository#patches --set-default
1809718109
ENV OPAMYES="1" OPAMCONFIRMLEVEL="unsafe-yes" OPAMERRLOGLEN="0" OPAMPRECISETRACKING="1"
1809818110
RUN opam switch create 4.06 --packages=ocaml-base-compiler.4.06.1
1809918111
RUN opam pin add -k version ocaml-base-compiler 4.06.1
@@ -18107,6 +18119,7 @@ ocurrent/opam-staging:ubuntu-24.10-ocaml-4.05-amd64 -> ocaml/opam:ubuntu-ocaml-4
1810718119
# syntax=docker/dockerfile:1
1810818120

1810918121
FROM ocurrent/opam-staging:ubuntu-24.10-opam-arm64
18122+
RUN opam repo add ocaml-patches-overlay git+https://github.com/ocurrent/opam-repository#patches --set-default
1811018123
ENV OPAMYES="1" OPAMCONFIRMLEVEL="unsafe-yes" OPAMERRLOGLEN="0" OPAMPRECISETRACKING="1"
1811118124
RUN opam switch create 4.06 --packages=ocaml-base-compiler.4.06.1
1811218125
RUN opam pin add -k version ocaml-base-compiler 4.06.1
@@ -18120,6 +18133,7 @@ ocurrent/opam-staging:ubuntu-24.10-ocaml-4.05-amd64 -> ocaml/opam:ubuntu-ocaml-4
1812018133
# syntax=docker/dockerfile:1
1812118134

1812218135
FROM ocurrent/opam-staging:ubuntu-24.10-opam-amd64
18136+
RUN opam repo add ocaml-patches-overlay git+https://github.com/ocurrent/opam-repository#patches --set-default
1812318137
ENV OPAMYES="1" OPAMCONFIRMLEVEL="unsafe-yes" OPAMERRLOGLEN="0" OPAMPRECISETRACKING="1"
1812418138
RUN opam switch create 4.06 --packages=ocaml-base-compiler.4.06.1
1812518139
RUN opam pin add -k version ocaml-base-compiler 4.06.1
@@ -18135,6 +18149,7 @@ ocurrent/opam-staging:ubuntu-24.10-ocaml-4.06-s390x, ocurrent/opam-staging:ubunt
1813518149
# syntax=docker/dockerfile:1
1813618150

1813718151
FROM ocurrent/opam-staging:ubuntu-24.10-opam-s390x
18152+
RUN opam repo add ocaml-patches-overlay git+https://github.com/ocurrent/opam-repository#patches --set-default
1813818153
ENV OPAMYES="1" OPAMCONFIRMLEVEL="unsafe-yes" OPAMERRLOGLEN="0" OPAMPRECISETRACKING="1"
1813918154
RUN opam switch create 4.07 --packages=ocaml-base-compiler.4.07.1
1814018155
RUN opam pin add -k version ocaml-base-compiler 4.07.1
@@ -18148,6 +18163,7 @@ ocurrent/opam-staging:ubuntu-24.10-ocaml-4.06-s390x, ocurrent/opam-staging:ubunt
1814818163
# syntax=docker/dockerfile:1
1814918164

1815018165
FROM ocurrent/opam-staging:ubuntu-24.10-opam-ppc64le
18166+
RUN opam repo add ocaml-patches-overlay git+https://github.com/ocurrent/opam-repository#patches --set-default
1815118167
ENV OPAMYES="1" OPAMCONFIRMLEVEL="unsafe-yes" OPAMERRLOGLEN="0" OPAMPRECISETRACKING="1"
1815218168
RUN opam switch create 4.07 --packages=ocaml-base-compiler.4.07.1
1815318169
RUN opam pin add -k version ocaml-base-compiler 4.07.1
@@ -18161,6 +18177,7 @@ ocurrent/opam-staging:ubuntu-24.10-ocaml-4.06-s390x, ocurrent/opam-staging:ubunt
1816118177
# syntax=docker/dockerfile:1
1816218178

1816318179
FROM ocurrent/opam-staging:ubuntu-24.10-opam-arm64
18180+
RUN opam repo add ocaml-patches-overlay git+https://github.com/ocurrent/opam-repository#patches --set-default
1816418181
ENV OPAMYES="1" OPAMCONFIRMLEVEL="unsafe-yes" OPAMERRLOGLEN="0" OPAMPRECISETRACKING="1"
1816518182
RUN opam switch create 4.07 --packages=ocaml-base-compiler.4.07.1
1816618183
RUN opam pin add -k version ocaml-base-compiler 4.07.1
@@ -18174,6 +18191,7 @@ ocurrent/opam-staging:ubuntu-24.10-ocaml-4.06-s390x, ocurrent/opam-staging:ubunt
1817418191
# syntax=docker/dockerfile:1
1817518192

1817618193
FROM ocurrent/opam-staging:ubuntu-24.10-opam-amd64
18194+
RUN opam repo add ocaml-patches-overlay git+https://github.com/ocurrent/opam-repository#patches --set-default
1817718195
ENV OPAMYES="1" OPAMCONFIRMLEVEL="unsafe-yes" OPAMERRLOGLEN="0" OPAMPRECISETRACKING="1"
1817818196
RUN opam switch create 4.07 --packages=ocaml-base-compiler.4.07.1
1817918197
RUN opam pin add -k version ocaml-base-compiler 4.07.1

‎ocaml-dockerfile‎

‎src/pipeline.ml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@ let maybe_add_overlay (run : 'a run) distro switch =
3535
| true, `Debian `Testing
3636
| true, `Debian `Unstable
3737
| true, `Fedora `V40
38+
| true, `Fedora `V41
39+
| true, `Ubuntu `V24_10
3840
| true, `OpenSUSE `Tumbleweed ->
3941
run "opam repo add ocaml-patches-overlay git+https://github.com/ocurrent/opam-repository#patches --set-default"
4042
| _, _ ->

0 commit comments

Comments
 (0)