Skip to content

Commit

Permalink
Always use the alternate repo for arm32
Browse files Browse the repository at this point in the history
  • Loading branch information
dra27 committed Dec 17, 2022
1 parent 29881a1 commit da54a02
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
8 changes: 4 additions & 4 deletions builds.expected
Original file line number Diff line number Diff line change
Expand Up @@ -2405,7 +2405,7 @@ debian-11/ppc64le
debian-11/arm32v7
# syntax=docker/dockerfile:1
# Autogenerated by OCaml-Dockerfile scripts
FROM --platform=arm debian:11
FROM --platform=arm arm32v7/debian:11
SHELL [ "/usr/bin/linux32", "/bin/bash", "-c" ]
LABEL distro_style="apt"
RUN apt-get -y update
Expand All @@ -2417,7 +2417,7 @@ debian-11/arm32v7
RUN cd /tmp/opam-sources && cp -P -R -p . ../opam-build-2.0 && cd ../opam-build-2.0 && git checkout 2.0 && ln -s ../opam/src_ext/archives src_ext/archives && env PATH="/tmp/opam/bootstrap/ocaml/bin:$PATH" ./configure --enable-cold-check && env PATH="/tmp/opam/bootstrap/ocaml/bin:$PATH" make lib-ext all && mkdir -p /usr/local/bin && cp /tmp/opam-build-2.0/opam /usr/local/bin/opam-2.0 && chmod a+x /usr/local/bin/opam-2.0 && rm -rf /tmp/opam-build-2.0
RUN cd /tmp/opam-sources && cp -P -R -p . ../opam-build-2.1 && cd ../opam-build-2.1 && git checkout 2.1 && ln -s ../opam/src_ext/archives src_ext/archives && env PATH="/tmp/opam/bootstrap/ocaml/bin:$PATH" ./configure --enable-cold-check --with-0install-solver && env PATH="/tmp/opam/bootstrap/ocaml/bin:$PATH" make lib-ext all && mkdir -p /usr/local/bin && cp /tmp/opam-build-2.1/opam /usr/local/bin/opam-2.1 && chmod a+x /usr/local/bin/opam-2.1 && rm -rf /tmp/opam-build-2.1
RUN cd /tmp/opam-sources && cp -P -R -p . ../opam-build-master && cd ../opam-build-master && git checkout master && ln -s ../opam/src_ext/archives src_ext/archives && env PATH="/tmp/opam/bootstrap/ocaml/bin:$PATH" ./configure --enable-cold-check --with-0install-solver && env PATH="/tmp/opam/bootstrap/ocaml/bin:$PATH" make lib-ext all && mkdir -p /usr/local/bin && cp /tmp/opam-build-master/opam /usr/local/bin/opam-master && chmod a+x /usr/local/bin/opam-master && rm -rf /tmp/opam-build-master
FROM debian:11
FROM arm32v7/debian:11
RUN ln -fs /usr/share/zoneinfo/Europe/London /etc/localtime
RUN apt-get -y update
RUN DEBIAN_FRONTEND=noninteractive apt-get -y upgrade
Expand Down Expand Up @@ -6055,7 +6055,7 @@ debian-10/ppc64le
debian-10/arm32v7
# syntax=docker/dockerfile:1
# Autogenerated by OCaml-Dockerfile scripts
FROM --platform=arm debian:10
FROM --platform=arm arm32v7/debian:10
SHELL [ "/usr/bin/linux32", "/bin/bash", "-c" ]
LABEL distro_style="apt"
RUN apt-get -y update
Expand All @@ -6071,7 +6071,7 @@ debian-10/arm32v7
RUN cd /tmp/opam-sources && cp -P -R -p . ../opam-build-2.0 && cd ../opam-build-2.0 && git checkout 2.0 && ln -s ../opam/src_ext/archives src_ext/archives && env PATH="/tmp/opam/bootstrap/ocaml/bin:$PATH" ./configure --enable-cold-check && env PATH="/tmp/opam/bootstrap/ocaml/bin:$PATH" make lib-ext all && mkdir -p /usr/local/bin && cp /tmp/opam-build-2.0/opam /usr/local/bin/opam-2.0 && chmod a+x /usr/local/bin/opam-2.0 && rm -rf /tmp/opam-build-2.0
RUN cd /tmp/opam-sources && cp -P -R -p . ../opam-build-2.1 && cd ../opam-build-2.1 && git checkout 2.1 && ln -s ../opam/src_ext/archives src_ext/archives && env PATH="/tmp/opam/bootstrap/ocaml/bin:$PATH" ./configure --enable-cold-check --with-0install-solver && env PATH="/tmp/opam/bootstrap/ocaml/bin:$PATH" make lib-ext all && mkdir -p /usr/local/bin && cp /tmp/opam-build-2.1/opam /usr/local/bin/opam-2.1 && chmod a+x /usr/local/bin/opam-2.1 && rm -rf /tmp/opam-build-2.1
RUN cd /tmp/opam-sources && cp -P -R -p . ../opam-build-master && cd ../opam-build-master && git checkout master && ln -s ../opam/src_ext/archives src_ext/archives && env PATH="/tmp/opam/bootstrap/ocaml/bin:$PATH" ./configure --enable-cold-check --with-0install-solver && env PATH="/tmp/opam/bootstrap/ocaml/bin:$PATH" make lib-ext all && mkdir -p /usr/local/bin && cp /tmp/opam-build-master/opam /usr/local/bin/opam-master && chmod a+x /usr/local/bin/opam-master && rm -rf /tmp/opam-build-master
FROM debian:10
FROM arm32v7/debian:10
RUN ln -fs /usr/share/zoneinfo/Europe/London /etc/localtime
COPY --from=0 [ "/usr/local/bin/bwrap", "/usr/bin/bwrap" ]
RUN apt-get -y update
Expand Down
2 changes: 1 addition & 1 deletion ocaml-dockerfile

0 comments on commit da54a02

Please sign in to comment.