From 604e81b0d6a41f2ed54f136a2540cc76cf4588de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonin=20D=C3=A9cimo?= Date: Fri, 10 Mar 2023 17:25:39 +0100 Subject: [PATCH] Optimise and fix Linux packages installation --- builds.expected | 96 +++++++----------------------------------------- ocaml-dockerfile | 2 +- 2 files changed, 15 insertions(+), 83 deletions(-) diff --git a/builds.expected b/builds.expected index c11d47d..318df57 100644 --- a/builds.expected +++ b/builds.expected @@ -1762,7 +1762,7 @@ archlinux/amd64 # Autogenerated by OCaml-Dockerfile scripts FROM archlinux:latest LABEL distro_style="pacman" - RUN pacman -Syu --noconfirm make gcc patch tar ca-certificates git rsync curl sudo bash libx11 nano coreutils xz ncurses diffutils unzip + RUN pacman -Syu --noconfirm make gcc patch tar ca-certificates git rsync curl sudo bash libx11 nano coreutils xz ncurses diffutils unzip && yes | pacman -Scc RUN git config --global user.email "docker@example.com" RUN git config --global user.name "Docker" RUN git clone https://github.com/ocaml/opam /tmp/opam && cd /tmp/opam && cp -P -R -p . ../opam-sources && git checkout master && env MAKE='make -j' shell/bootstrap-ocaml.sh && make -C src_ext cache-archives @@ -1771,7 +1771,7 @@ archlinux/amd64 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 RUN strip /usr/local/bin/opam* FROM archlinux:latest - RUN pacman -Syu --noconfirm make gcc patch tar ca-certificates git rsync curl sudo bash libx11 nano coreutils xz ncurses diffutils unzip bubblewrap + RUN pacman -Syu --noconfirm make gcc patch tar ca-certificates git rsync curl sudo bash libx11 nano coreutils xz ncurses diffutils unzip bubblewrap && yes | pacman -Scc COPY --from=0 [ "/usr/local/bin/opam-2.0", "/usr/bin/opam-2.0" ] RUN ln /usr/bin/opam-2.0 /usr/bin/opam COPY --from=0 [ "/usr/local/bin/opam-2.1", "/usr/bin/opam-2.1" ] @@ -2010,8 +2010,6 @@ debian-11/s390x 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 RUN ln -fs /usr/share/zoneinfo/Europe/London /etc/localtime - RUN apt-get -y update - RUN DEBIAN_FRONTEND=noninteractive apt-get -y upgrade COPY <<-EOF /etc/apt/apt.conf.d/mirror-retry Acquire::Retries "5"; EOF @@ -2085,8 +2083,6 @@ debian-11/ppc64le 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 RUN ln -fs /usr/share/zoneinfo/Europe/London /etc/localtime - RUN apt-get -y update - RUN DEBIAN_FRONTEND=noninteractive apt-get -y upgrade COPY <<-EOF /etc/apt/apt.conf.d/mirror-retry Acquire::Retries "5"; EOF @@ -2162,8 +2158,6 @@ debian-11/arm32v7 FROM --platform=arm debian:11 SHELL [ "/usr/bin/linux32", "/bin/bash", "-c" ] RUN ln -fs /usr/share/zoneinfo/Europe/London /etc/localtime - RUN apt-get -y update - RUN DEBIAN_FRONTEND=noninteractive apt-get -y upgrade COPY <<-EOF /etc/apt/apt.conf.d/mirror-retry Acquire::Retries "5"; EOF @@ -2238,8 +2232,6 @@ debian-11/arm64 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 RUN ln -fs /usr/share/zoneinfo/Europe/London /etc/localtime - RUN apt-get -y update - RUN DEBIAN_FRONTEND=noninteractive apt-get -y upgrade COPY <<-EOF /etc/apt/apt.conf.d/mirror-retry Acquire::Retries "5"; EOF @@ -2313,8 +2305,6 @@ debian-11/amd64 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 RUN ln -fs /usr/share/zoneinfo/Europe/London /etc/localtime - RUN apt-get -y update - RUN DEBIAN_FRONTEND=noninteractive apt-get -y upgrade COPY <<-EOF /etc/apt/apt.conf.d/mirror-retry Acquire::Retries "5"; EOF @@ -2390,8 +2380,6 @@ debian-11/i386 FROM --platform=386 debian:11 SHELL [ "/usr/bin/linux32", "/bin/bash", "-c" ] RUN ln -fs /usr/share/zoneinfo/Europe/London /etc/localtime - RUN apt-get -y update - RUN DEBIAN_FRONTEND=noninteractive apt-get -y upgrade COPY <<-EOF /etc/apt/apt.conf.d/mirror-retry Acquire::Retries "5"; EOF @@ -5641,8 +5629,6 @@ debian-10/s390x FROM s390x/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 - RUN DEBIAN_FRONTEND=noninteractive apt-get -y upgrade COPY <<-EOF /etc/apt/apt.conf.d/mirror-retry Acquire::Retries "5"; EOF @@ -5721,8 +5707,6 @@ debian-10/ppc64le FROM ppc64le/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 - RUN DEBIAN_FRONTEND=noninteractive apt-get -y upgrade COPY <<-EOF /etc/apt/apt.conf.d/mirror-retry Acquire::Retries "5"; EOF @@ -5803,8 +5787,6 @@ debian-10/arm32v7 SHELL [ "/usr/bin/linux32", "/bin/bash", "-c" ] 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 - RUN DEBIAN_FRONTEND=noninteractive apt-get -y upgrade COPY <<-EOF /etc/apt/apt.conf.d/mirror-retry Acquire::Retries "5"; EOF @@ -5884,8 +5866,6 @@ debian-10/arm64 FROM 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 - RUN DEBIAN_FRONTEND=noninteractive apt-get -y upgrade COPY <<-EOF /etc/apt/apt.conf.d/mirror-retry Acquire::Retries "5"; EOF @@ -5964,8 +5944,6 @@ debian-10/amd64 FROM 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 - RUN DEBIAN_FRONTEND=noninteractive apt-get -y upgrade COPY <<-EOF /etc/apt/apt.conf.d/mirror-retry Acquire::Retries "5"; EOF @@ -6046,8 +6024,6 @@ debian-10/i386 SHELL [ "/usr/bin/linux32", "/bin/bash", "-c" ] 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 - RUN DEBIAN_FRONTEND=noninteractive apt-get -y upgrade COPY <<-EOF /etc/apt/apt.conf.d/mirror-retry Acquire::Retries "5"; EOF @@ -7068,8 +7044,6 @@ debian-testing/amd64 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:testing RUN ln -fs /usr/share/zoneinfo/Europe/London /etc/localtime - RUN apt-get -y update - RUN DEBIAN_FRONTEND=noninteractive apt-get -y upgrade COPY <<-EOF /etc/apt/apt.conf.d/mirror-retry Acquire::Retries "5"; EOF @@ -7318,8 +7292,6 @@ debian-unstable/amd64 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:unstable RUN ln -fs /usr/share/zoneinfo/Europe/London /etc/localtime - RUN apt-get -y update - RUN DEBIAN_FRONTEND=noninteractive apt-get -y upgrade COPY <<-EOF /etc/apt/apt.conf.d/mirror-retry Acquire::Retries "5"; EOF @@ -7559,8 +7531,8 @@ fedora-36/arm64 LABEL distro_style="rpm" RUN yum --version || dnf install -y yum RUN yum update -y + RUN yum install -y which tar curl xz libcap-devel openssl sudo && yum clean all RUN yum groupinstall -y "Development Tools" && yum clean all - RUN yum install -y sudo passwd bzip2 patch rsync nano gcc-c++ git tar curl xz libX11-devel which m4 diffutils findutils which tar curl xz libcap-devel openssl && yum clean all RUN git config --global user.email "docker@example.com" RUN git config --global user.name "Docker" RUN git clone https://github.com/ocaml/opam /tmp/opam && cd /tmp/opam && cp -P -R -p . ../opam-sources && git checkout master && env MAKE='make -j' shell/bootstrap-ocaml.sh && make -C src_ext cache-archives @@ -7570,8 +7542,8 @@ fedora-36/arm64 FROM fedora:36 RUN yum --version || dnf install -y yum RUN yum update -y - RUN yum groupinstall -y "Development Tools" && yum clean all RUN yum install -y sudo passwd bzip2 patch rsync nano gcc-c++ git tar curl xz libX11-devel which m4 diffutils findutils bubblewrap && yum clean all + RUN yum groupinstall -y "Development Tools" && yum clean all COPY --from=0 [ "/usr/bin/opam-2.0", "/usr/bin/opam-2.0" ] RUN ln /usr/bin/opam-2.0 /usr/bin/opam COPY --from=0 [ "/usr/bin/opam-2.1", "/usr/bin/opam-2.1" ] @@ -7631,8 +7603,8 @@ fedora-36/amd64 LABEL distro_style="rpm" RUN yum --version || dnf install -y yum RUN yum update -y + RUN yum install -y which tar curl xz libcap-devel openssl sudo && yum clean all RUN yum groupinstall -y "Development Tools" && yum clean all - RUN yum install -y sudo passwd bzip2 patch rsync nano gcc-c++ git tar curl xz libX11-devel which m4 diffutils findutils which tar curl xz libcap-devel openssl && yum clean all RUN git config --global user.email "docker@example.com" RUN git config --global user.name "Docker" RUN git clone https://github.com/ocaml/opam /tmp/opam && cd /tmp/opam && cp -P -R -p . ../opam-sources && git checkout master && env MAKE='make -j' shell/bootstrap-ocaml.sh && make -C src_ext cache-archives @@ -7642,8 +7614,8 @@ fedora-36/amd64 FROM fedora:36 RUN yum --version || dnf install -y yum RUN yum update -y - RUN yum groupinstall -y "Development Tools" && yum clean all RUN yum install -y sudo passwd bzip2 patch rsync nano gcc-c++ git tar curl xz libX11-devel which m4 diffutils findutils bubblewrap && yum clean all + RUN yum groupinstall -y "Development Tools" && yum clean all COPY --from=0 [ "/usr/bin/opam-2.0", "/usr/bin/opam-2.0" ] RUN ln /usr/bin/opam-2.0 /usr/bin/opam COPY --from=0 [ "/usr/bin/opam-2.1", "/usr/bin/opam-2.1" ] @@ -7969,8 +7941,8 @@ fedora-37/arm64 LABEL distro_style="rpm" RUN yum --version || dnf install -y yum RUN yum update -y + RUN yum install -y which tar curl xz libcap-devel openssl sudo && yum clean all RUN yum groupinstall -y "Development Tools" && yum clean all - RUN yum install -y sudo passwd bzip2 patch rsync nano gcc-c++ git tar curl xz libX11-devel which m4 diffutils findutils which tar curl xz libcap-devel openssl && yum clean all RUN git config --global user.email "docker@example.com" RUN git config --global user.name "Docker" RUN git clone https://github.com/ocaml/opam /tmp/opam && cd /tmp/opam && cp -P -R -p . ../opam-sources && git checkout master && env MAKE='make -j' shell/bootstrap-ocaml.sh && make -C src_ext cache-archives @@ -7980,8 +7952,8 @@ fedora-37/arm64 FROM fedora:37 RUN yum --version || dnf install -y yum RUN yum update -y - RUN yum groupinstall -y "Development Tools" && yum clean all RUN yum install -y sudo passwd bzip2 patch rsync nano gcc-c++ git tar curl xz libX11-devel which m4 diffutils findutils bubblewrap && yum clean all + RUN yum groupinstall -y "Development Tools" && yum clean all COPY --from=0 [ "/usr/bin/opam-2.0", "/usr/bin/opam-2.0" ] RUN ln /usr/bin/opam-2.0 /usr/bin/opam COPY --from=0 [ "/usr/bin/opam-2.1", "/usr/bin/opam-2.1" ] @@ -8041,8 +8013,8 @@ fedora-37/amd64 LABEL distro_style="rpm" RUN yum --version || dnf install -y yum RUN yum update -y + RUN yum install -y which tar curl xz libcap-devel openssl sudo && yum clean all RUN yum groupinstall -y "Development Tools" && yum clean all - RUN yum install -y sudo passwd bzip2 patch rsync nano gcc-c++ git tar curl xz libX11-devel which m4 diffutils findutils which tar curl xz libcap-devel openssl && yum clean all RUN git config --global user.email "docker@example.com" RUN git config --global user.name "Docker" RUN git clone https://github.com/ocaml/opam /tmp/opam && cd /tmp/opam && cp -P -R -p . ../opam-sources && git checkout master && env MAKE='make -j' shell/bootstrap-ocaml.sh && make -C src_ext cache-archives @@ -8052,8 +8024,8 @@ fedora-37/amd64 FROM fedora:37 RUN yum --version || dnf install -y yum RUN yum update -y - RUN yum groupinstall -y "Development Tools" && yum clean all RUN yum install -y sudo passwd bzip2 patch rsync nano gcc-c++ git tar curl xz libX11-devel which m4 diffutils findutils bubblewrap && yum clean all + RUN yum groupinstall -y "Development Tools" && yum clean all COPY --from=0 [ "/usr/bin/opam-2.0", "/usr/bin/opam-2.0" ] RUN ln /usr/bin/opam-2.0 /usr/bin/opam COPY --from=0 [ "/usr/bin/opam-2.1", "/usr/bin/opam-2.1" ] @@ -8395,8 +8367,8 @@ oraclelinux-8/amd64 LABEL distro_style="rpm" RUN yum --version || dnf install -y yum RUN yum update -y + RUN yum install -y which tar curl xz libcap-devel openssl sudo && yum clean all RUN yum groupinstall -y "Development Tools" && yum clean all - RUN yum install -y sudo passwd bzip2 patch rsync nano gcc-c++ git tar curl xz libX11-devel which m4 diffutils findutils which tar curl xz libcap-devel openssl && yum clean all RUN git config --global user.email "docker@example.com" RUN git config --global user.name "Docker" RUN curl -fOL https://github.com/containers/bubblewrap/releases/download/v0.8.0/bubblewrap-0.8.0.tar.xz @@ -8409,10 +8381,10 @@ oraclelinux-8/amd64 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/bin && cp /tmp/opam-build-master/opam /usr/bin/opam-master && chmod a+x /usr/bin/opam-master && rm -rf /tmp/opam-build-master FROM oraclelinux:8 RUN yum --version || dnf install -y yum - RUN yum update -y COPY --from=0 [ "/usr/local/bin/bwrap", "/usr/bin/bwrap" ] - RUN yum groupinstall -y "Development Tools" && yum clean all + RUN yum update -y RUN yum install -y sudo passwd bzip2 patch rsync nano gcc-c++ git tar curl xz libX11-devel which m4 diffutils findutils && yum clean all + RUN yum groupinstall -y "Development Tools" && yum clean all COPY --from=0 [ "/usr/bin/opam-2.0", "/usr/bin/opam-2.0" ] RUN ln /usr/bin/opam-2.0 /usr/bin/opam COPY --from=0 [ "/usr/bin/opam-2.1", "/usr/bin/opam-2.1" ] @@ -8675,9 +8647,7 @@ opensuse-15.4/amd64 RUN zypper update -y RUN zypper install --force-resolution -y -t pattern devel_C_C++ RUN zypper update -y - RUN zypper install --force-resolution -y sudo git unzip curl gcc-c++ libcap-devel xz libX11-devel bzip2 which rsync gzip - RUN zypper update -y - RUN zypper install --force-resolution -y bubblewrap + RUN zypper install --force-resolution -y sudo git unzip curl gcc-c++ libcap-devel xz libX11-devel bzip2 which rsync gzip bubblewrap COPY --from=0 [ "/usr/bin/opam-2.0", "/usr/bin/opam-2.0" ] RUN ln /usr/bin/opam-2.0 /usr/bin/opam COPY --from=0 [ "/usr/bin/opam-2.1", "/usr/bin/opam-2.1" ] @@ -8937,8 +8907,6 @@ ubuntu-18.04/s390x FROM ubuntu:bionic 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 - RUN DEBIAN_FRONTEND=noninteractive apt-get -y upgrade COPY <<-EOF /etc/apt/apt.conf.d/mirror-retry Acquire::Retries "5"; EOF @@ -9017,8 +8985,6 @@ ubuntu-18.04/ppc64le FROM ubuntu:bionic 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 - RUN DEBIAN_FRONTEND=noninteractive apt-get -y upgrade COPY <<-EOF /etc/apt/apt.conf.d/mirror-retry Acquire::Retries "5"; EOF @@ -9097,8 +9063,6 @@ ubuntu-18.04/arm64 FROM ubuntu:bionic 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 - RUN DEBIAN_FRONTEND=noninteractive apt-get -y upgrade COPY <<-EOF /etc/apt/apt.conf.d/mirror-retry Acquire::Retries "5"; EOF @@ -9177,8 +9141,6 @@ ubuntu-18.04/amd64 FROM ubuntu:bionic 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 - RUN DEBIAN_FRONTEND=noninteractive apt-get -y upgrade COPY <<-EOF /etc/apt/apt.conf.d/mirror-retry Acquire::Retries "5"; EOF @@ -9771,8 +9733,6 @@ ubuntu-20.04/s390x FROM ubuntu:focal 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 - RUN DEBIAN_FRONTEND=noninteractive apt-get -y upgrade COPY <<-EOF /etc/apt/apt.conf.d/mirror-retry Acquire::Retries "5"; EOF @@ -9851,8 +9811,6 @@ ubuntu-20.04/ppc64le FROM ubuntu:focal 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 - RUN DEBIAN_FRONTEND=noninteractive apt-get -y upgrade COPY <<-EOF /etc/apt/apt.conf.d/mirror-retry Acquire::Retries "5"; EOF @@ -9931,8 +9889,6 @@ ubuntu-20.04/arm64 FROM ubuntu:focal 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 - RUN DEBIAN_FRONTEND=noninteractive apt-get -y upgrade COPY <<-EOF /etc/apt/apt.conf.d/mirror-retry Acquire::Retries "5"; EOF @@ -10011,8 +9967,6 @@ ubuntu-20.04/amd64 FROM ubuntu:focal 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 - RUN DEBIAN_FRONTEND=noninteractive apt-get -y upgrade COPY <<-EOF /etc/apt/apt.conf.d/mirror-retry Acquire::Retries "5"; EOF @@ -10091,8 +10045,6 @@ ubuntu-20.04/riscv64 FROM riscv64/ubuntu:focal 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 - RUN DEBIAN_FRONTEND=noninteractive apt-get -y upgrade COPY <<-EOF /etc/apt/apt.conf.d/mirror-retry Acquire::Retries "5"; EOF @@ -10741,8 +10693,6 @@ ubuntu-22.04/s390x 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 ubuntu:jammy RUN ln -fs /usr/share/zoneinfo/Europe/London /etc/localtime - RUN apt-get -y update - RUN DEBIAN_FRONTEND=noninteractive apt-get -y upgrade COPY <<-EOF /etc/apt/apt.conf.d/mirror-retry Acquire::Retries "5"; EOF @@ -10816,8 +10766,6 @@ ubuntu-22.04/ppc64le 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 ubuntu:jammy RUN ln -fs /usr/share/zoneinfo/Europe/London /etc/localtime - RUN apt-get -y update - RUN DEBIAN_FRONTEND=noninteractive apt-get -y upgrade COPY <<-EOF /etc/apt/apt.conf.d/mirror-retry Acquire::Retries "5"; EOF @@ -10891,8 +10839,6 @@ ubuntu-22.04/arm64 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 ubuntu:jammy RUN ln -fs /usr/share/zoneinfo/Europe/London /etc/localtime - RUN apt-get -y update - RUN DEBIAN_FRONTEND=noninteractive apt-get -y upgrade COPY <<-EOF /etc/apt/apt.conf.d/mirror-retry Acquire::Retries "5"; EOF @@ -10966,8 +10912,6 @@ ubuntu-22.04/amd64 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 ubuntu:jammy RUN ln -fs /usr/share/zoneinfo/Europe/London /etc/localtime - RUN apt-get -y update - RUN DEBIAN_FRONTEND=noninteractive apt-get -y upgrade COPY <<-EOF /etc/apt/apt.conf.d/mirror-retry Acquire::Retries "5"; EOF @@ -11041,8 +10985,6 @@ ubuntu-22.04/riscv64 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 riscv64/ubuntu:jammy RUN ln -fs /usr/share/zoneinfo/Europe/London /etc/localtime - RUN apt-get -y update - RUN DEBIAN_FRONTEND=noninteractive apt-get -y upgrade COPY <<-EOF /etc/apt/apt.conf.d/mirror-retry Acquire::Retries "5"; EOF @@ -11707,8 +11649,6 @@ ubuntu-22.10/s390x 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 ubuntu:kinetic RUN ln -fs /usr/share/zoneinfo/Europe/London /etc/localtime - RUN apt-get -y update - RUN DEBIAN_FRONTEND=noninteractive apt-get -y upgrade COPY <<-EOF /etc/apt/apt.conf.d/mirror-retry Acquire::Retries "5"; EOF @@ -11782,8 +11722,6 @@ ubuntu-22.10/ppc64le 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 ubuntu:kinetic RUN ln -fs /usr/share/zoneinfo/Europe/London /etc/localtime - RUN apt-get -y update - RUN DEBIAN_FRONTEND=noninteractive apt-get -y upgrade COPY <<-EOF /etc/apt/apt.conf.d/mirror-retry Acquire::Retries "5"; EOF @@ -11857,8 +11795,6 @@ ubuntu-22.10/arm64 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 ubuntu:kinetic RUN ln -fs /usr/share/zoneinfo/Europe/London /etc/localtime - RUN apt-get -y update - RUN DEBIAN_FRONTEND=noninteractive apt-get -y upgrade COPY <<-EOF /etc/apt/apt.conf.d/mirror-retry Acquire::Retries "5"; EOF @@ -11932,8 +11868,6 @@ ubuntu-22.10/amd64 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 ubuntu:kinetic RUN ln -fs /usr/share/zoneinfo/Europe/London /etc/localtime - RUN apt-get -y update - RUN DEBIAN_FRONTEND=noninteractive apt-get -y upgrade COPY <<-EOF /etc/apt/apt.conf.d/mirror-retry Acquire::Retries "5"; EOF @@ -12007,8 +11941,6 @@ ubuntu-22.10/riscv64 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 riscv64/ubuntu:kinetic RUN ln -fs /usr/share/zoneinfo/Europe/London /etc/localtime - RUN apt-get -y update - RUN DEBIAN_FRONTEND=noninteractive apt-get -y upgrade COPY <<-EOF /etc/apt/apt.conf.d/mirror-retry Acquire::Retries "5"; EOF diff --git a/ocaml-dockerfile b/ocaml-dockerfile index 37428dc..f9bd142 160000 --- a/ocaml-dockerfile +++ b/ocaml-dockerfile @@ -1 +1 @@ -Subproject commit 37428dcde83383cf29315daba67596d0fceb5b1a +Subproject commit f9bd142e7a066d4e175e1e951c3d47f431f21a55