From ce4484abe8b1f3a1f8b16590ac1b6dc7bdab512f Mon Sep 17 00:00:00 2001 From: justiceadams Date: Tue, 1 Apr 2025 14:30:51 -0700 Subject: [PATCH 1/3] update nightly-6.1 dependencies --- nightly-6.1/debian/12/Dockerfile | 56 ++++++++-------------- nightly-6.1/debian/12/buildx/Dockerfile | 53 ++++++++------------ nightly-6.1/fedora/39/Dockerfile | 40 +++++----------- nightly-6.1/fedora/39/buildx/Dockerfile | 37 +++++--------- nightly-6.1/ubuntu/24.04/Dockerfile | 3 +- nightly-6.1/ubuntu/24.04/buildx/Dockerfile | 5 +- 6 files changed, 69 insertions(+), 125 deletions(-) diff --git a/nightly-6.1/debian/12/Dockerfile b/nightly-6.1/debian/12/Dockerfile index 06b09b8b..e242cdf0 100644 --- a/nightly-6.1/debian/12/Dockerfile +++ b/nightly-6.1/debian/12/Dockerfile @@ -3,35 +3,25 @@ FROM debian:12 RUN groupadd -g 998 build-user && \ useradd -m -r -u 998 -g build-user build-user -ENV DEBIAN_FRONTEND="noninteractive" - -RUN apt-get -y update && apt-get -y install \ - build-essential \ - clang \ - cmake \ - diffutils \ - git \ - icu-devtools \ - libcurl4-openssl-dev \ - libedit-dev \ - libicu-dev \ - libncurses-dev \ - libpython3-dev \ - libsqlite3-dev \ - libxml2-dev \ - ninja-build \ - pkg-config \ - python3-distutils \ - python3-pip \ - python3-pkg-resources \ - python3-psutil \ - rsync \ - swig \ - systemtap-sdt-dev \ - tzdata \ - uuid-dev \ - zip \ - libstdc++-12-dev +RUN export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true && apt-get -q update && \ + apt-get -q install -y \ + binutils-gold \ + curl \ + gpg \ + libicu-dev \ + libcurl4-openssl-dev \ + libedit-dev \ + libsqlite3-dev \ + libncurses-dev \ + libpython3-dev \ + libxml2-dev \ + pkg-config \ + uuid-dev \ + tzdata \ + git \ + gcc \ + libstdc++-12-dev \ + && rm -r /var/lib/apt/lists/* ARG SWIFT_SIGNING_KEY=E813C892820A6FA13755B268F167DF1ACF9CE069 @@ -46,9 +36,6 @@ ENV SWIFT_PLATFORM=$SWIFT_PLATFORM \ SWIFT_WEBROOT=$SWIFT_WEBROOT \ SWIFT_PREFIX=$SWIFT_PREFIX -COPY swift-ci/dependencies/requirements.txt /dependencies/ -RUN pip3 install -r /dependencies/requirements.txt --break-system-packages - RUN set -e; \ ARCH_NAME="$(dpkg --print-architecture)"; \ url=; \ @@ -61,10 +48,7 @@ RUN set -e; \ ;; \ *) echo >&2 "error: unsupported architecture: '$ARCH_NAME'"; exit 1 ;; \ esac; \ - # - Grab curl here so we cache better up above - export DEBIAN_FRONTEND=noninteractive \ - && apt-get -q update && apt-get -q install -y curl && rm -rf /var/lib/apt/lists/* \ - && export $(curl -s ${SWIFT_WEBROOT}${OS_ARCH_SUFFIX}/latest-build.yml | grep 'download:' | sed 's/:[^:\/\/]/=/g') \ + export $(curl -s ${SWIFT_WEBROOT}${OS_ARCH_SUFFIX}/latest-build.yml | grep 'download:' | sed 's/:[^:\/\/]/=/g') \ && export $(curl -s ${SWIFT_WEBROOT}${OS_ARCH_SUFFIX}/latest-build.yml | grep 'download_signature:' | sed 's/:[^:\/\/]/=/g') \ && export DOWNLOAD_DIR=$(echo $download | sed "s/-${SWIFT_PLATFORM}${OS_ARCH_SUFFIX}.tar.gz//g") \ && echo $DOWNLOAD_DIR > .swift_tag \ diff --git a/nightly-6.1/debian/12/buildx/Dockerfile b/nightly-6.1/debian/12/buildx/Dockerfile index 2a11d0d5..7487753c 100644 --- a/nightly-6.1/debian/12/buildx/Dockerfile +++ b/nightly-6.1/debian/12/buildx/Dockerfile @@ -3,35 +3,25 @@ FROM debian:12 as Base RUN groupadd -g 998 build-user && \ useradd -m -r -u 998 -g build-user build-user -ENV DEBIAN_FRONTEND="noninteractive" - -RUN apt-get -y update && apt-get -y install \ - build-essential \ - clang \ - cmake \ - diffutils \ - git \ - icu-devtools \ - libcurl4-openssl-dev \ - libedit-dev \ - libicu-dev \ - libncurses-dev \ - libpython3-dev \ - libsqlite3-dev \ - libxml2-dev \ - ninja-build \ - pkg-config \ - python3-distutils \ - python3-pip \ - python3-pkg-resources \ - python3-psutil \ - rsync \ - swig \ - systemtap-sdt-dev \ - tzdata \ - uuid-dev \ - zip \ - libstdc++-12-dev +RUN export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true && apt-get -q update && \ + apt-get -q install -y \ + binutils-gold \ + curl \ + gpg \ + libicu-dev \ + libcurl4-openssl-dev \ + libedit-dev \ + libsqlite3-dev \ + libncurses-dev \ + libpython3-dev \ + libxml2-dev \ + pkg-config \ + uuid-dev \ + tzdata \ + git \ + gcc \ + libstdc++-12-dev \ + && rm -r /var/lib/apt/lists/* ARG SWIFT_SIGNING_KEY=E813C892820A6FA13755B268F167DF1ACF9CE069 @@ -68,10 +58,7 @@ RUN set -e; \ ;; \ *) echo >&2 "error: unsupported architecture: '$ARCH_NAME'"; exit 1 ;; \ esac; \ - # - Grab curl here so we cache better up above - export DEBIAN_FRONTEND=noninteractive \ - && apt-get -q update && apt-get -q install -y curl && rm -rf /var/lib/apt/lists/* \ - && export $(curl -s ${SWIFT_WEBROOT}${OS_ARCH_SUFFIX}/latest-build.yml | grep 'download:' | sed 's/:[^:\/\/]/=/g') \ + export $(curl -s ${SWIFT_WEBROOT}${OS_ARCH_SUFFIX}/latest-build.yml | grep 'download:' | sed 's/:[^:\/\/]/=/g') \ && export $(curl -s ${SWIFT_WEBROOT}${OS_ARCH_SUFFIX}/latest-build.yml | grep 'download_signature:' | sed 's/:[^:\/\/]/=/g') \ && export DOWNLOAD_DIR=$(echo $download | sed "s/-${SWIFT_PLATFORM}${OS_ARCH_SUFFIX}.tar.gz//g") \ && echo $DOWNLOAD_DIR > .swift_tag \ diff --git a/nightly-6.1/fedora/39/Dockerfile b/nightly-6.1/fedora/39/Dockerfile index bf2b7c36..0cc950fa 100644 --- a/nightly-6.1/fedora/39/Dockerfile +++ b/nightly-6.1/fedora/39/Dockerfile @@ -5,30 +5,19 @@ LABEL description="Docker Container for the Swift programming language" RUN groupadd -g 998 build-user && \ useradd -m -r -u 998 -g build-user build-user -RUN yum install -y \ - libcurl-devel \ - libedit-devel \ - libicu-devel \ - sqlite-devel \ - libuuid-devel \ - libxml2-devel \ - python3 \ - python3-pip \ - python3-devel \ - python3-distro \ - python3-setuptools \ - python3-six \ - rsync \ - swig \ - clang \ - perl-podlators \ - which \ - git \ - cmake \ - zip \ - unzip \ - diffutils \ - libstdc++-devel \ +RUN yum -y install \ + binutils \ + gcc \ + git \ + unzip \ + libcurl-devel \ + libedit-devel \ + libicu-devel \ + sqlite-devel \ + libuuid-devel \ + libxml2-devel \ + python3-devel \ + libstdc++-devel \ libstdc++-static @@ -49,9 +38,6 @@ ENV SWIFT_SIGNING_KEY=$SWIFT_SIGNING_KEY \ SWIFT_WEBROOT=$SWIFT_WEBROOT \ SWIFT_PREFIX=$SWIFT_PREFIX -COPY swift-ci/dependencies/requirements.txt /dependencies/ -RUN pip3 install -r /dependencies/requirements.txt - RUN set -e; \ ARCH_NAME="$(rpm --eval '%{_arch}')"; \ url=; \ diff --git a/nightly-6.1/fedora/39/buildx/Dockerfile b/nightly-6.1/fedora/39/buildx/Dockerfile index f326f65c..6d9b4407 100644 --- a/nightly-6.1/fedora/39/buildx/Dockerfile +++ b/nightly-6.1/fedora/39/buildx/Dockerfile @@ -5,30 +5,19 @@ LABEL description="Docker Container for the Swift programming language" RUN groupadd -g 998 build-user && \ useradd -m -r -u 998 -g build-user build-user -RUN yum install -y \ - libcurl-devel \ - libedit-devel \ - libicu-devel \ - sqlite-devel \ - libuuid-devel \ - libxml2-devel \ - python3 \ - python3-pip \ - python3-devel \ - python3-distro \ - python3-setuptools \ - python3-six \ - rsync \ - swig \ - clang \ - perl-podlators \ - which \ - git \ - cmake \ - zip \ - unzip \ - diffutils \ - libstdc++-devel \ +RUN yum -y install \ + binutils \ + gcc \ + git \ + unzip \ + libcurl-devel \ + libedit-devel \ + libicu-devel \ + sqlite-devel \ + libuuid-devel \ + libxml2-devel \ + python3-devel \ + libstdc++-devel \ libstdc++-static diff --git a/nightly-6.1/ubuntu/24.04/Dockerfile b/nightly-6.1/ubuntu/24.04/Dockerfile index 90033d62..41915786 100644 --- a/nightly-6.1/ubuntu/24.04/Dockerfile +++ b/nightly-6.1/ubuntu/24.04/Dockerfile @@ -6,17 +6,16 @@ RUN export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true && ap apt-get -q install -y \ binutils \ git \ - unzip \ gnupg2 \ libc6-dev \ libcurl4-openssl-dev \ + libncurses5-dev \ libedit2 \ libgcc-13-dev \ libpython3-dev \ libsqlite3-0 \ libstdc++-13-dev \ libxml2-dev \ - libncurses-dev \ libz3-dev \ pkg-config \ tzdata \ diff --git a/nightly-6.1/ubuntu/24.04/buildx/Dockerfile b/nightly-6.1/ubuntu/24.04/buildx/Dockerfile index 964d1410..68348e04 100644 --- a/nightly-6.1/ubuntu/24.04/buildx/Dockerfile +++ b/nightly-6.1/ubuntu/24.04/buildx/Dockerfile @@ -11,15 +11,14 @@ RUN export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true && ap libcurl4-openssl-dev \ libncurses5-dev \ libedit2 \ - libgcc-11-dev \ + libgcc-13-dev \ libpython3-dev \ libsqlite3-0 \ - libstdc++-11-dev \ + libstdc++-13-dev \ libxml2-dev \ libz3-dev \ pkg-config \ tzdata \ - zip \ zlib1g-dev \ && rm -r /var/lib/apt/lists/* From 8aff7282313bb15819cf1e314635b01a93ff6688 Mon Sep 17 00:00:00 2001 From: justiceadams Date: Tue, 1 Apr 2025 15:05:51 -0700 Subject: [PATCH 2/3] update nightly-main dependencies --- nightly-main/debian/12/Dockerfile | 53 ++++++++------------- nightly-main/debian/12/buildx/Dockerfile | 51 ++++++++------------ nightly-main/fedora/39/Dockerfile | 40 +++++----------- nightly-main/fedora/39/buildx/Dockerfile | 37 +++++--------- nightly-main/ubuntu/24.04/Dockerfile | 9 +--- nightly-main/ubuntu/24.04/buildx/Dockerfile | 12 ++--- 6 files changed, 71 insertions(+), 131 deletions(-) diff --git a/nightly-main/debian/12/Dockerfile b/nightly-main/debian/12/Dockerfile index 09305d2b..1c129439 100644 --- a/nightly-main/debian/12/Dockerfile +++ b/nightly-main/debian/12/Dockerfile @@ -3,35 +3,25 @@ FROM debian:12 RUN groupadd -g 998 build-user && \ useradd -m -r -u 998 -g build-user build-user -ENV DEBIAN_FRONTEND="noninteractive" - -RUN apt-get -y update && apt-get -y install \ - build-essential \ - clang \ - cmake \ - diffutils \ - git \ - icu-devtools \ - libcurl4-openssl-dev \ - libedit-dev \ - libicu-dev \ - libncurses-dev \ - libpython3-dev \ - libsqlite3-dev \ - libxml2-dev \ - ninja-build \ - pkg-config \ - python3-distutils \ - python3-pip \ - python3-pkg-resources \ - python3-psutil \ - rsync \ - swig \ - systemtap-sdt-dev \ - tzdata \ - uuid-dev \ - zip \ - libstdc++-12-dev +RUN export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true && apt-get -q update && \ + apt-get -q install -y \ + binutils-gold \ + curl \ + gpg \ + libicu-dev \ + libcurl4-openssl-dev \ + libedit-dev \ + libsqlite3-dev \ + libncurses-dev \ + libpython3-dev \ + libxml2-dev \ + pkg-config \ + uuid-dev \ + tzdata \ + git \ + gcc \ + libstdc++-12-dev \ + && rm -r /var/lib/apt/lists/* ARG SWIFT_SIGNING_KEY=E813C892820A6FA13755B268F167DF1ACF9CE069 @@ -61,10 +51,7 @@ RUN set -e; \ ;; \ *) echo >&2 "error: unsupported architecture: '$ARCH_NAME'"; exit 1 ;; \ esac; \ - # - Grab curl here so we cache better up above - export DEBIAN_FRONTEND=noninteractive \ - && apt-get -q update && apt-get -q install -y curl && rm -rf /var/lib/apt/lists/* \ - && export $(curl -s ${SWIFT_WEBROOT}${OS_ARCH_SUFFIX}/latest-build.yml | grep 'download:' | sed 's/:[^:\/\/]/=/g') \ + export $(curl -s ${SWIFT_WEBROOT}${OS_ARCH_SUFFIX}/latest-build.yml | grep 'download:' | sed 's/:[^:\/\/]/=/g') \ && export $(curl -s ${SWIFT_WEBROOT}${OS_ARCH_SUFFIX}/latest-build.yml | grep 'download_signature:' | sed 's/:[^:\/\/]/=/g') \ && export DOWNLOAD_DIR=$(echo $download | sed "s/-${SWIFT_PLATFORM}${OS_ARCH_SUFFIX}.tar.gz//g") \ && echo $DOWNLOAD_DIR > .swift_tag \ diff --git a/nightly-main/debian/12/buildx/Dockerfile b/nightly-main/debian/12/buildx/Dockerfile index 6927f1ae..669f80b8 100644 --- a/nightly-main/debian/12/buildx/Dockerfile +++ b/nightly-main/debian/12/buildx/Dockerfile @@ -5,33 +5,25 @@ RUN groupadd -g 998 build-user && \ ENV DEBIAN_FRONTEND="noninteractive" -RUN apt-get -y update && apt-get -y install \ - build-essential \ - clang \ - cmake \ - diffutils \ - git \ - icu-devtools \ - libcurl4-openssl-dev \ - libedit-dev \ - libicu-dev \ - libncurses-dev \ - libpython3-dev \ - libsqlite3-dev \ - libxml2-dev \ - ninja-build \ - pkg-config \ - python3-distutils \ - python3-pip \ - python3-pkg-resources \ - python3-psutil \ - rsync \ - swig \ - systemtap-sdt-dev \ - tzdata \ - uuid-dev \ - zip \ - libstdc++-12-dev +RUN export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true && apt-get -q update && \ + apt-get -q install -y \ + binutils-gold \ + curl \ + gpg \ + libicu-dev \ + libcurl4-openssl-dev \ + libedit-dev \ + libsqlite3-dev \ + libncurses-dev \ + libpython3-dev \ + libxml2-dev \ + pkg-config \ + uuid-dev \ + tzdata \ + git \ + gcc \ + libstdc++-12-dev \ + && rm -r /var/lib/apt/lists/* ARG SWIFT_SIGNING_KEY=E813C892820A6FA13755B268F167DF1ACF9CE069 @@ -68,10 +60,7 @@ RUN set -e; \ ;; \ *) echo >&2 "error: unsupported architecture: '$ARCH_NAME'"; exit 1 ;; \ esac; \ - # - Grab curl here so we cache better up above - export DEBIAN_FRONTEND=noninteractive \ - && apt-get -q update && apt-get -q install -y curl && rm -rf /var/lib/apt/lists/* \ - && export $(curl -s ${SWIFT_WEBROOT}${OS_ARCH_SUFFIX}/latest-build.yml | grep 'download:' | sed 's/:[^:\/\/]/=/g') \ + export $(curl -s ${SWIFT_WEBROOT}${OS_ARCH_SUFFIX}/latest-build.yml | grep 'download:' | sed 's/:[^:\/\/]/=/g') \ && export $(curl -s ${SWIFT_WEBROOT}${OS_ARCH_SUFFIX}/latest-build.yml | grep 'download_signature:' | sed 's/:[^:\/\/]/=/g') \ && export DOWNLOAD_DIR=$(echo $download | sed "s/-${SWIFT_PLATFORM}${OS_ARCH_SUFFIX}.tar.gz//g") \ && echo $DOWNLOAD_DIR > .swift_tag \ diff --git a/nightly-main/fedora/39/Dockerfile b/nightly-main/fedora/39/Dockerfile index e58fc4cb..3dfa400a 100644 --- a/nightly-main/fedora/39/Dockerfile +++ b/nightly-main/fedora/39/Dockerfile @@ -5,30 +5,19 @@ LABEL description="Docker Container for the Swift programming language" RUN groupadd -g 998 build-user && \ useradd -m -r -u 998 -g build-user build-user -RUN yum install -y \ - libcurl-devel \ - libedit-devel \ - libicu-devel \ - sqlite-devel \ - libuuid-devel \ - libxml2-devel \ - python3 \ - python3-pip \ - python3-devel \ - python3-distro \ - python3-setuptools \ - python3-six \ - rsync \ - swig \ - clang \ - perl-podlators \ - which \ - git \ - cmake \ - zip \ - unzip \ - diffutils \ - libstdc++-devel \ +RUN yum -y install \ + binutils \ + gcc \ + git \ + unzip \ + libcurl-devel \ + libedit-devel \ + libicu-devel \ + sqlite-devel \ + libuuid-devel \ + libxml2-devel \ + python3-devel \ + libstdc++-devel \ libstdc++-static @@ -49,9 +38,6 @@ ENV SWIFT_SIGNING_KEY=$SWIFT_SIGNING_KEY \ SWIFT_WEBROOT=$SWIFT_WEBROOT \ SWIFT_PREFIX=$SWIFT_PREFIX -COPY swift-ci/dependencies/requirements.txt /dependencies/ -RUN pip3 install -r /dependencies/requirements.txt - RUN set -e; \ ARCH_NAME="$(rpm --eval '%{_arch}')"; \ url=; \ diff --git a/nightly-main/fedora/39/buildx/Dockerfile b/nightly-main/fedora/39/buildx/Dockerfile index 8b0cd722..f7144c56 100644 --- a/nightly-main/fedora/39/buildx/Dockerfile +++ b/nightly-main/fedora/39/buildx/Dockerfile @@ -5,30 +5,19 @@ LABEL description="Docker Container for the Swift programming language" RUN groupadd -g 998 build-user && \ useradd -m -r -u 998 -g build-user build-user -RUN yum install -y \ - libcurl-devel \ - libedit-devel \ - libicu-devel \ - sqlite-devel \ - libuuid-devel \ - libxml2-devel \ - python3 \ - python3-pip \ - python3-devel \ - python3-distro \ - python3-setuptools \ - python3-six \ - rsync \ - swig \ - clang \ - perl-podlators \ - which \ - git \ - cmake \ - zip \ - unzip \ - diffutils \ - libstdc++-devel \ +RUN yum -y install \ + binutils \ + gcc \ + git \ + unzip \ + libcurl-devel \ + libedit-devel \ + libicu-devel \ + sqlite-devel \ + libuuid-devel \ + libxml2-devel \ + python3-devel \ + libstdc++-devel \ libstdc++-static diff --git a/nightly-main/ubuntu/24.04/Dockerfile b/nightly-main/ubuntu/24.04/Dockerfile index 0a90ae56..5e5e5706 100644 --- a/nightly-main/ubuntu/24.04/Dockerfile +++ b/nightly-main/ubuntu/24.04/Dockerfile @@ -6,17 +6,16 @@ RUN export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true && ap apt-get -q install -y \ binutils \ git \ - unzip \ gnupg2 \ libc6-dev \ libcurl4-openssl-dev \ + libncurses5-dev \ libedit2 \ libgcc-13-dev \ libpython3-dev \ libsqlite3-0 \ libstdc++-13-dev \ libxml2-dev \ - libncurses-dev \ libz3-dev \ pkg-config \ tzdata \ @@ -46,11 +45,7 @@ ENV SWIFT_SIGNING_KEY=$SWIFT_SIGNING_KEY \ RUN echo "${SWIFT_WEBROOT}/latest-build.yml" RUN set -e; \ - # - Grab curl here so we cache better up above - export DEBIAN_FRONTEND=noninteractive \ - && apt-get -q update && apt-get -q install -y curl && rm -rf /var/lib/apt/lists/* \ - # - Latest Toolchain info - && export $(curl -s ${SWIFT_WEBROOT}/latest-build.yml | grep 'download:' | sed 's/:[^:\/\/]/=/g') \ + export $(curl -s ${SWIFT_WEBROOT}/latest-build.yml | grep 'download:' | sed 's/:[^:\/\/]/=/g') \ && export $(curl -s ${SWIFT_WEBROOT}/latest-build.yml | grep 'download_signature:' | sed 's/:[^:\/\/]/=/g') \ && export DOWNLOAD_DIR=$(echo $download | sed "s/-${OS_VER}.tar.gz//g") \ && echo $DOWNLOAD_DIR > .swift_tag \ diff --git a/nightly-main/ubuntu/24.04/buildx/Dockerfile b/nightly-main/ubuntu/24.04/buildx/Dockerfile index 078a28db..d92e2183 100644 --- a/nightly-main/ubuntu/24.04/buildx/Dockerfile +++ b/nightly-main/ubuntu/24.04/buildx/Dockerfile @@ -11,18 +11,16 @@ RUN export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true && ap libcurl4-openssl-dev \ libncurses5-dev \ libedit2 \ - libgcc-11-dev \ + libgcc-13-dev \ libpython3-dev \ libsqlite3-0 \ - libstdc++-11-dev \ + libstdc++-13-dev \ libxml2-dev \ libz3-dev \ pkg-config \ tzdata \ - zip \ zlib1g-dev \ && rm -r /var/lib/apt/lists/* - # Everything up to here should cache nicely between Swift versions, assuming dev dependencies change little # gpg --keyid-format LONG -k FAF6989E1BC16FEA @@ -51,11 +49,7 @@ ARG PLATFORM_WEBROOT="$SWIFT_WEBROOT/$SWIFT_PLATFORM$OS_MAJOR_VER$OS_MIN_VER$OS_ RUN echo "${PLATFORM_WEBROOT}/latest-build.yml" RUN set -e; \ - # - Grab curl here so we cache better up above - export DEBIAN_FRONTEND=noninteractive \ - && apt-get -q update && apt-get -q install -y curl && rm -rf /var/lib/apt/lists/* \ - # - Latest Toolchain info - && export $(curl -s ${PLATFORM_WEBROOT}/latest-build.yml | grep 'download:' | sed 's/:[^:\/\/]/=/g') \ + export $(curl -s ${PLATFORM_WEBROOT}/latest-build.yml | grep 'download:' | sed 's/:[^:\/\/]/=/g') \ && export $(curl -s ${PLATFORM_WEBROOT}/latest-build.yml | grep 'download_signature:' | sed 's/:[^:\/\/]/=/g') \ && export DOWNLOAD_DIR=$(echo $download | sed "s/-${OS_VER}.tar.gz//g") \ && echo $DOWNLOAD_DIR > .swift_tag \ From 0aab5e1fc4a92447fa8ceafc9c66d6fd0dd21824 Mon Sep 17 00:00:00 2001 From: justiceadams Date: Tue, 1 Apr 2025 15:14:18 -0700 Subject: [PATCH 3/3] fix ubuntu images --- nightly-6.1/ubuntu/24.04/Dockerfile | 7 ++----- nightly-6.1/ubuntu/24.04/buildx/Dockerfile | 7 ++----- nightly-main/ubuntu/24.04/Dockerfile | 1 + nightly-main/ubuntu/24.04/buildx/Dockerfile | 1 + 4 files changed, 6 insertions(+), 10 deletions(-) diff --git a/nightly-6.1/ubuntu/24.04/Dockerfile b/nightly-6.1/ubuntu/24.04/Dockerfile index 41915786..df0f2de9 100644 --- a/nightly-6.1/ubuntu/24.04/Dockerfile +++ b/nightly-6.1/ubuntu/24.04/Dockerfile @@ -5,6 +5,7 @@ LABEL description="Docker Container for the Swift programming language" RUN export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true && apt-get -q update && \ apt-get -q install -y \ binutils \ + curl \ git \ gnupg2 \ libc6-dev \ @@ -44,11 +45,7 @@ ENV SWIFT_SIGNING_KEY=$SWIFT_SIGNING_KEY \ RUN echo "${SWIFT_WEBROOT}/latest-build.yml" RUN set -e; \ - # - Grab curl here so we cache better up above - export DEBIAN_FRONTEND=noninteractive \ - && apt-get -q update && apt-get -q install -y curl && rm -rf /var/lib/apt/lists/* \ - # - Latest Toolchain info - && export $(curl -s ${SWIFT_WEBROOT}/latest-build.yml | grep 'download:' | sed 's/:[^:\/\/]/=/g') \ + export $(curl -s ${SWIFT_WEBROOT}/latest-build.yml | grep 'download:' | sed 's/:[^:\/\/]/=/g') \ && export $(curl -s ${SWIFT_WEBROOT}/latest-build.yml | grep 'download_signature:' | sed 's/:[^:\/\/]/=/g') \ && export DOWNLOAD_DIR=$(echo $download | sed "s/-${OS_VER}.tar.gz//g") \ && echo $DOWNLOAD_DIR > .swift_tag \ diff --git a/nightly-6.1/ubuntu/24.04/buildx/Dockerfile b/nightly-6.1/ubuntu/24.04/buildx/Dockerfile index 68348e04..9e3190c0 100644 --- a/nightly-6.1/ubuntu/24.04/buildx/Dockerfile +++ b/nightly-6.1/ubuntu/24.04/buildx/Dockerfile @@ -5,6 +5,7 @@ LABEL description="Docker Container for the Swift programming language" RUN export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true && apt-get -q update && \ apt-get -q install -y \ binutils \ + curl \ git \ gnupg2 \ libc6-dev \ @@ -50,11 +51,7 @@ ARG PLATFORM_WEBROOT="$SWIFT_WEBROOT/$SWIFT_PLATFORM$OS_MAJOR_VER$OS_MIN_VER$OS_ RUN echo "${PLATFORM_WEBROOT}/latest-build.yml" RUN set -e; \ - # - Grab curl here so we cache better up above - export DEBIAN_FRONTEND=noninteractive \ - && apt-get -q update && apt-get -q install -y curl && rm -rf /var/lib/apt/lists/* \ - # - Latest Toolchain info - && export $(curl -s ${PLATFORM_WEBROOT}/latest-build.yml | grep 'download:' | sed 's/:[^:\/\/]/=/g') \ + export $(curl -s ${PLATFORM_WEBROOT}/latest-build.yml | grep 'download:' | sed 's/:[^:\/\/]/=/g') \ && export $(curl -s ${PLATFORM_WEBROOT}/latest-build.yml | grep 'download_signature:' | sed 's/:[^:\/\/]/=/g') \ && export DOWNLOAD_DIR=$(echo $download | sed "s/-${OS_VER}.tar.gz//g") \ && echo $DOWNLOAD_DIR > .swift_tag \ diff --git a/nightly-main/ubuntu/24.04/Dockerfile b/nightly-main/ubuntu/24.04/Dockerfile index 5e5e5706..0fc3783b 100644 --- a/nightly-main/ubuntu/24.04/Dockerfile +++ b/nightly-main/ubuntu/24.04/Dockerfile @@ -5,6 +5,7 @@ LABEL description="Docker Container for the Swift programming language" RUN export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true && apt-get -q update && \ apt-get -q install -y \ binutils \ + curl \ git \ gnupg2 \ libc6-dev \ diff --git a/nightly-main/ubuntu/24.04/buildx/Dockerfile b/nightly-main/ubuntu/24.04/buildx/Dockerfile index d92e2183..5846944a 100644 --- a/nightly-main/ubuntu/24.04/buildx/Dockerfile +++ b/nightly-main/ubuntu/24.04/buildx/Dockerfile @@ -5,6 +5,7 @@ LABEL description="Docker Container for the Swift programming language" RUN export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true && apt-get -q update && \ apt-get -q install -y \ binutils \ + curl \ git \ gnupg2 \ libc6-dev \