From 99823436b3f902c2b9e82d8324bb57bf5a193370 Mon Sep 17 00:00:00 2001 From: Evan Wilde Date: Fri, 14 Feb 2025 13:11:58 -0800 Subject: [PATCH] Removing CentOS 7 and Ubuntu 23.10 Both CentOS 7 and Ubuntu 23.10 are EOL. They are failing to build at this point because it appears that the package repositories for these distros is no longer available. --- swift-ci/main/centos/7/Dockerfile | 84 -------------------------- swift-ci/main/ubuntu/23.10/Dockerfile | 85 --------------------------- 2 files changed, 169 deletions(-) delete mode 100644 swift-ci/main/centos/7/Dockerfile delete mode 100644 swift-ci/main/ubuntu/23.10/Dockerfile diff --git a/swift-ci/main/centos/7/Dockerfile b/swift-ci/main/centos/7/Dockerfile deleted file mode 100644 index 4d38603a..00000000 --- a/swift-ci/main/centos/7/Dockerfile +++ /dev/null @@ -1,84 +0,0 @@ -FROM centos:7 - -RUN yum install shadow-utils.x86_64 -y - -RUN groupadd -g 998 build-user && \ - useradd -m -r -u 42 -g build-user build-user - -RUN yum install -y epel-release centos-release-scl - -RUN yum install --enablerepo=centosplus -y \ - autoconf \ - cmake \ - devtoolset-8 \ - glibc-static \ - libatomic \ - libcurl-devel \ - libedit-devel \ - libstdc++-static \ - libtool \ - libuuid-devel \ - libxml2-devel \ - make \ - ncurses-devel \ - ninja-build \ - openssl-devel \ - pexpect \ - python-devel \ - python3-devel \ - python-pygments \ - python-six \ - python36-pexpect \ - python36-six \ - PyYAML \ - rsync \ - sclo-git25-git \ - sqlite-devel \ - swig3 \ - which \ - unzip \ - zip \ - zlib-devel - -RUN echo -e ". /opt/rh/sclo-git25/enable\n. /opt/rh/devtoolset-8/enable\n" >> /home/build-user/.bashrc - -RUN sed -i -e 's/\*__block/\*__libc_block/g' /usr/include/unistd.h - -ARG SWIFT_PLATFORM=centos7 -ARG SWIFT_VERSION=5.8.1 -ARG SWIFT_BRANCH=swift-${SWIFT_VERSION}-release -ARG SWIFT_TAG=swift-${SWIFT_VERSION}-RELEASE -ARG SWIFT_WEBROOT=https://download.swift.org -ARG SWIFT_PREFIX=/opt/swift/${SWIFT_VERSION} - -ENV SWIFT_PLATFORM=$SWIFT_PLATFORM \ - SWIFT_VERSION=$SWIFT_VERSION \ - SWIFT_BRANCH=$SWIFT_BRANCH \ - SWIFT_TAG=$SWIFT_TAG \ - SWIFT_WEBROOT=$SWIFT_WEBROOT \ - SWIFT_PREFIX=$SWIFT_PREFIX - -RUN set -e; \ - SWIFT_WEBDIR="$SWIFT_WEBROOT/$SWIFT_BRANCH/$(echo $SWIFT_PLATFORM | tr -d .)" \ - && SWIFT_BIN_URL="$SWIFT_WEBDIR/$SWIFT_TAG/$SWIFT_TAG-$SWIFT_PLATFORM.tar.gz" \ - && SWIFT_SIG_URL="$SWIFT_BIN_URL.sig" \ - # - Download the GPG keys, Swift toolchain, and toolchain signature, and verify. - && export GNUPGHOME="$(mktemp -d)" \ - && curl -fsSL "$SWIFT_BIN_URL" -o swift.tar.gz "$SWIFT_SIG_URL" -o swift.tar.gz.sig \ - && curl -fSsL https://swift.org/keys/all-keys.asc | gpg --import - \ - && gpg --batch --verify swift.tar.gz.sig swift.tar.gz \ - # - Unpack the toolchain, set libs permissions, and clean up. - && mkdir -p $SWIFT_PREFIX \ - && tar -xzf swift.tar.gz --directory $SWIFT_PREFIX --strip-components=1 \ - && chmod -R o+r $SWIFT_PREFIX/usr/lib/swift \ - && rm -rf "$GNUPGHOME" swift.tar.gz.sig swift.tar.gz - -ENV PATH="${SWIFT_PREFIX}/usr/bin:${PATH}" - -USER build-user - -WORKDIR /home/build-user - -ENV LC_ALL en_US.UTF-8 -ENV LANG en_US.UTF-8 -ENV LANGUAGE en_US.UTF-8 diff --git a/swift-ci/main/ubuntu/23.10/Dockerfile b/swift-ci/main/ubuntu/23.10/Dockerfile deleted file mode 100644 index c347b823..00000000 --- a/swift-ci/main/ubuntu/23.10/Dockerfile +++ /dev/null @@ -1,85 +0,0 @@ -FROM ubuntu:23.10 - -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 \ - cmake \ - git \ - icu-devtools \ - libcurl4-openssl-dev \ - libedit-dev \ - libicu-dev \ - libncurses5-dev \ - libpython3-dev \ - libsqlite3-dev \ - libxml2-dev \ - ninja-build \ - pkg-config \ - python3-six \ - python3-pip \ - python3-distutils \ - python3-pkg-resources \ - python3-psutil \ - rsync \ - swig \ - systemtap-sdt-dev \ - tzdata \ - uuid-dev \ - zip - -COPY swift-ci/dependencies/requirements.txt /dependencies/ -RUN pip3 install -r /dependencies/requirements.txt --break-system-packages - -ARG SWIFT_PLATFORM=ubuntu23.10 -ARG SWIFT_VERSION=5.10.1 -ARG SWIFT_BRANCH=swift-${SWIFT_VERSION}-release -ARG SWIFT_TAG=swift-${SWIFT_VERSION}-RELEASE -ARG SWIFT_WEBROOT=https://download.swift.org -ARG SWIFT_PREFIX=/opt/swift/${SWIFT_VERSION} - -ENV SWIFT_PLATFORM=$SWIFT_PLATFORM \ - SWIFT_VERSION=$SWIFT_VERSION \ - SWIFT_BRANCH=$SWIFT_BRANCH \ - SWIFT_TAG=$SWIFT_TAG \ - SWIFT_WEBROOT=$SWIFT_WEBROOT \ - SWIFT_PREFIX=$SWIFT_PREFIX - -RUN set -e; \ - ARCH_NAME="$(dpkg --print-architecture)"; \ - url=; \ - case "${ARCH_NAME##*-}" in \ - 'amd64') \ - OS_ARCH_SUFFIX=''; \ - ;; \ - 'arm64') \ - OS_ARCH_SUFFIX='-aarch64'; \ - ;; \ - *) echo >&2 "error: unsupported architecture: '$ARCH_NAME'"; exit 1 ;; \ - esac; \ - SWIFT_WEBDIR="$SWIFT_WEBROOT/$SWIFT_BRANCH/$(echo $SWIFT_PLATFORM | tr -d .)$OS_ARCH_SUFFIX" \ - && SWIFT_BIN_URL="$SWIFT_WEBDIR/$SWIFT_TAG/$SWIFT_TAG-$SWIFT_PLATFORM$OS_ARCH_SUFFIX.tar.gz" \ - && SWIFT_SIG_URL="$SWIFT_BIN_URL.sig" \ - # - 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/* \ - # - Download the GPG keys, Swift toolchain, and toolchain signature, and verify. - && export GNUPGHOME="$(mktemp -d)" \ - && curl -fsSL "$SWIFT_BIN_URL" -o swift.tar.gz "$SWIFT_SIG_URL" -o swift.tar.gz.sig \ - && curl -fSsL https://swift.org/keys/all-keys.asc | gpg --import - \ - && gpg --batch --verify swift.tar.gz.sig swift.tar.gz \ - # - Unpack the toolchain, set libs permissions, and clean up. - && mkdir -p $SWIFT_PREFIX \ - && tar -xzf swift.tar.gz --directory $SWIFT_PREFIX --strip-components=1 \ - && chmod -R o+r $SWIFT_PREFIX/usr/lib/swift \ - && rm -rf "$GNUPGHOME" swift.tar.gz.sig swift.tar.gz \ - && apt-get purge --auto-remove -y curl - -ENV PATH="${SWIFT_PREFIX}/usr/bin:${PATH}" - -USER build-user - -WORKDIR /home/build-user \ No newline at end of file