From 63a6cac1254d2e9de98396c73b808db959e0a698 Mon Sep 17 00:00:00 2001 From: Donghee Na Date: Fri, 27 Sep 2024 10:53:43 -0700 Subject: [PATCH 1/5] autoconf: Update autoconf image file to use Ubuntu distro --- autoconf/Dockerfile | 30 +++++++++++++----------------- 1 file changed, 13 insertions(+), 17 deletions(-) diff --git a/autoconf/Dockerfile b/autoconf/Dockerfile index 2c74811..c0c823e 100644 --- a/autoconf/Dockerfile +++ b/autoconf/Dockerfile @@ -1,4 +1,4 @@ -FROM docker.io/library/alpine:3.20 +FROM docker.io/library/ubuntu:22.04 ARG AUTOCONF_VERSION="2.71" ARG AUTOCONF_ARCHIVE_VERSION="2023.02.20" @@ -10,37 +10,33 @@ LABEL org.opencontainers.image.authors="Donghee Na" LABEL org.opencontainers.image.title="GNU Autoconf ${AUTOCONF_VERSION} container for CPython" LABEL org.opencontainers.image.description="Container image with GNU Autoconf ${AUTOCONF_VERSION}, GNU Automake ${AUTOMAKE_VERSION}, and autoconf-archive ${AUTOCONF_ARCHIVE_VERSION} for generating CPython's configure script." -RUN apk upgrade && \ - apk add \ - curl \ - alpine-sdk \ - autoconf \ - automake \ - pkgconfig \ - xz +RUN apt-get update && \ + apt-get -yq install \ + autotools-dev \ + autoconf \ + autoconf-archive \ + build-essential \ + curl \ + pkg-config -RUN set -o pipefail \ - && curl https://ftp.gnu.org/gnu/autoconf/autoconf-${AUTOCONF_VERSION}.tar.gz | tar -zxf - \ +RUN curl https://ftp.gnu.org/gnu/autoconf/autoconf-${AUTOCONF_VERSION}.tar.gz | tar -zxf - \ && cd autoconf-${AUTOCONF_VERSION} \ && ./configure --prefix=/usr/local \ && make \ && make install -RUN set -o pipefail \ - && curl https://ftp.gnu.org/gnu/automake/automake-${AUTOMAKE_VERSION}.tar.gz | tar -xzf - \ +RUN curl https://ftp.gnu.org/gnu/automake/automake-${AUTOMAKE_VERSION}.tar.gz | tar -xzf - \ && cd automake-${AUTOMAKE_VERSION} \ && ./configure --prefix=/usr/local \ && make \ && make install -RUN set -o pipefail \ - && curl https://ftp.gnu.org/gnu/autoconf-archive/autoconf-archive-${AUTOCONF_ARCHIVE_VERSION}.tar.xz | xz -cd - | tar -xf - \ +RUN curl https://ftp.gnu.org/gnu/autoconf-archive/autoconf-archive-${AUTOCONF_ARCHIVE_VERSION}.tar.xz | xz -cd - | tar -xf - \ && cd autoconf-archive-${AUTOCONF_ARCHIVE_VERSION} \ && ./configure --prefix=/usr/local \ && make \ && make install # https://stackoverflow.com/questions/8811381/possibly-undefined-macro-ac-msg-error/49103418#49103418 -RUN set -o pipefail \ - && cp /usr/local/share/aclocal/*.m4 /usr/share/aclocal \ +RUN cp /usr/local/share/aclocal/*.m4 /usr/share/aclocal \ && cp /usr/share/aclocal/*.m4 /usr/local/share/aclocal VOLUME /src From 8747aa68008367d8ddfa5cba8e28c0fd728f9385 Mon Sep 17 00:00:00 2001 From: Donghee Na Date: Tue, 1 Oct 2024 17:01:16 +0900 Subject: [PATCH 2/5] Address code review --- autoconf/Dockerfile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/autoconf/Dockerfile b/autoconf/Dockerfile index c0c823e..519f458 100644 --- a/autoconf/Dockerfile +++ b/autoconf/Dockerfile @@ -12,12 +12,12 @@ LABEL org.opencontainers.image.description="Container image with GNU Autoconf ${ RUN apt-get update && \ apt-get -yq install \ - autotools-dev \ - autoconf \ - autoconf-archive \ - build-essential \ - curl \ - pkg-config + autotools-dev \ + autoconf \ + autoconf-archive \ + build-essential \ + curl \ + pkg-config RUN curl https://ftp.gnu.org/gnu/autoconf/autoconf-${AUTOCONF_VERSION}.tar.gz | tar -zxf - \ && cd autoconf-${AUTOCONF_VERSION} \ From 7412b9abbc2c3c92b7b355b017e0a39ea225eb90 Mon Sep 17 00:00:00 2001 From: Donghee Na Date: Wed, 2 Oct 2024 09:42:03 +0900 Subject: [PATCH 3/5] nit --- autoconf/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/autoconf/Dockerfile b/autoconf/Dockerfile index 519f458..a91e556 100644 --- a/autoconf/Dockerfile +++ b/autoconf/Dockerfile @@ -11,7 +11,7 @@ LABEL org.opencontainers.image.title="GNU Autoconf ${AUTOCONF_VERSION} container LABEL org.opencontainers.image.description="Container image with GNU Autoconf ${AUTOCONF_VERSION}, GNU Automake ${AUTOMAKE_VERSION}, and autoconf-archive ${AUTOCONF_ARCHIVE_VERSION} for generating CPython's configure script." RUN apt-get update && \ - apt-get -yq install \ + apt-get install -yq \ autotools-dev \ autoconf \ autoconf-archive \ From 7352cee019ec2ea08174cdca27c326aec04ef7ae Mon Sep 17 00:00:00 2001 From: Donghee Na Date: Wed, 2 Oct 2024 10:12:12 +0900 Subject: [PATCH 4/5] Reset pipefail --- autoconf/Dockerfile | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/autoconf/Dockerfile b/autoconf/Dockerfile index a91e556..4ec7165 100644 --- a/autoconf/Dockerfile +++ b/autoconf/Dockerfile @@ -19,24 +19,28 @@ RUN apt-get update && \ curl \ pkg-config -RUN curl https://ftp.gnu.org/gnu/autoconf/autoconf-${AUTOCONF_VERSION}.tar.gz | tar -zxf - \ +RUN set -o pipefail \ + && curl https://ftp.gnu.org/gnu/autoconf/autoconf-${AUTOCONF_VERSION}.tar.gz | tar -zxf - \ && cd autoconf-${AUTOCONF_VERSION} \ && ./configure --prefix=/usr/local \ && make \ && make install -RUN curl https://ftp.gnu.org/gnu/automake/automake-${AUTOMAKE_VERSION}.tar.gz | tar -xzf - \ +RUN set -o pipefail \ + && curl https://ftp.gnu.org/gnu/automake/automake-${AUTOMAKE_VERSION}.tar.gz | tar -xzf - \ && cd automake-${AUTOMAKE_VERSION} \ && ./configure --prefix=/usr/local \ && make \ && make install -RUN curl https://ftp.gnu.org/gnu/autoconf-archive/autoconf-archive-${AUTOCONF_ARCHIVE_VERSION}.tar.xz | xz -cd - | tar -xf - \ +RUN set -o pipefail \ + && curl https://ftp.gnu.org/gnu/autoconf-archive/autoconf-archive-${AUTOCONF_ARCHIVE_VERSION}.tar.xz | xz -cd - | tar -xf - \ && cd autoconf-archive-${AUTOCONF_ARCHIVE_VERSION} \ && ./configure --prefix=/usr/local \ && make \ && make install # https://stackoverflow.com/questions/8811381/possibly-undefined-macro-ac-msg-error/49103418#49103418 -RUN cp /usr/local/share/aclocal/*.m4 /usr/share/aclocal \ +RUN set -o pipefail \ + && cp /usr/local/share/aclocal/*.m4 /usr/share/aclocal \ && cp /usr/share/aclocal/*.m4 /usr/local/share/aclocal VOLUME /src From b200e7a1668d340a8ffcc30f01307d565a976584 Mon Sep 17 00:00:00 2001 From: Donghee Na Date: Wed, 2 Oct 2024 19:06:51 +0900 Subject: [PATCH 5/5] fix --- autoconf/Dockerfile | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/autoconf/Dockerfile b/autoconf/Dockerfile index 4ec7165..1108f4c 100644 --- a/autoconf/Dockerfile +++ b/autoconf/Dockerfile @@ -19,28 +19,25 @@ RUN apt-get update && \ curl \ pkg-config -RUN set -o pipefail \ - && curl https://ftp.gnu.org/gnu/autoconf/autoconf-${AUTOCONF_VERSION}.tar.gz | tar -zxf - \ +SHELL ["/bin/bash", "-o", "pipefail", "-c"] +RUN curl https://ftp.gnu.org/gnu/autoconf/autoconf-${AUTOCONF_VERSION}.tar.gz | tar -zxf - \ && cd autoconf-${AUTOCONF_VERSION} \ && ./configure --prefix=/usr/local \ && make \ && make install -RUN set -o pipefail \ - && curl https://ftp.gnu.org/gnu/automake/automake-${AUTOMAKE_VERSION}.tar.gz | tar -xzf - \ +RUN curl https://ftp.gnu.org/gnu/automake/automake-${AUTOMAKE_VERSION}.tar.gz | tar -xzf - \ && cd automake-${AUTOMAKE_VERSION} \ && ./configure --prefix=/usr/local \ && make \ && make install -RUN set -o pipefail \ - && curl https://ftp.gnu.org/gnu/autoconf-archive/autoconf-archive-${AUTOCONF_ARCHIVE_VERSION}.tar.xz | xz -cd - | tar -xf - \ +RUN curl https://ftp.gnu.org/gnu/autoconf-archive/autoconf-archive-${AUTOCONF_ARCHIVE_VERSION}.tar.xz | xz -cd - | tar -xf - \ && cd autoconf-archive-${AUTOCONF_ARCHIVE_VERSION} \ && ./configure --prefix=/usr/local \ && make \ && make install # https://stackoverflow.com/questions/8811381/possibly-undefined-macro-ac-msg-error/49103418#49103418 -RUN set -o pipefail \ - && cp /usr/local/share/aclocal/*.m4 /usr/share/aclocal \ +RUN cp /usr/local/share/aclocal/*.m4 /usr/share/aclocal \ && cp /usr/share/aclocal/*.m4 /usr/local/share/aclocal VOLUME /src