From a93f17cf97550839f826412ccdbc9e3285b42907 Mon Sep 17 00:00:00 2001 From: Ryan Northey Date: Fri, 1 Oct 2021 08:20:56 +0100 Subject: [PATCH] images: Remove centos build image Signed-off-by: Ryan Northey --- azure-pipelines.yml | 3 -- build_container/Dockerfile-centos | 26 ----------- build_container/build_container_centos.sh | 57 ----------------------- 3 files changed, 86 deletions(-) delete mode 100644 build_container/Dockerfile-centos delete mode 100755 build_container/build_container_centos.sh diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 05b375c9..05295e09 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -9,9 +9,6 @@ jobs: OS_DISTRO: ubuntu PUSH_GCR_IMAGE: true GCR_IMAGE_NAME: envoy-build - centos: - OS_DISTRO: centos - PUSH_GCR_IMAGE: false dependsOn: [] timeoutInMinutes: 120 pool: diff --git a/build_container/Dockerfile-centos b/build_container/Dockerfile-centos deleted file mode 100644 index 06b8855b..00000000 --- a/build_container/Dockerfile-centos +++ /dev/null @@ -1,26 +0,0 @@ -#Add qemu function for supporting multiarch -ARG IMAGEARCH -FROM alpine:3.9.2 as qemu -RUN apk add --no-cache curl -ARG QEMUVERSION=4.0.0 -ARG QEMUARCH - -SHELL ["/bin/ash", "-o", "pipefail", "-c"] - -RUN curl -fsSL https://github.com/multiarch/qemu-user-static/releases/download/v${QEMUVERSION}/qemu-${QEMUARCH}-static.tar.gz | tar zxvf - -C /usr/bin -RUN chmod +x /usr/bin/qemu-* - -FROM ${IMAGEARCH}centos:7 - -ARG QEMUARCH -COPY --from=qemu /usr/bin/qemu-${QEMUARCH}-static /usr/bin/ - -COPY ./build_container_common.sh / -COPY ./build_container_centos.sh / - -ENV PATH /opt/rh/rh-git218/root/usr/bin:/opt/rh/devtoolset-7/root/usr/bin:/opt/llvm/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin -RUN ./build_container_centos.sh -ENV LC_ALL en_US.UTF-8 - -# In the end, remove qemu program -RUN rm -f /usr/bin/qemu-${QEMUARCH}-static diff --git a/build_container/build_container_centos.sh b/build_container/build_container_centos.sh deleted file mode 100755 index 5651aaab..00000000 --- a/build_container/build_container_centos.sh +++ /dev/null @@ -1,57 +0,0 @@ -#!/bin/bash - -set -e -ARCH="$(uname -m)" -# Note: rh-git218 is needed to run `git -C` in docs build process. -if [[ "${ARCH}" == "x86_64" ]]; then - yum install -y centos-release-scl epel-release -fi -yum update -y -yum install -y devtoolset-9-gcc devtoolset-9-gcc-c++ devtoolset-9-binutils java-1.8.0-openjdk-headless jq rsync \ - rh-git218 wget unzip which make cmake3 patch ninja-build devtoolset-9-libatomic-devel openssl python27 \ - libtool autoconf tcpdump graphviz doxygen sudo - -# set locale -localedef -c -f UTF-8 -i en_US en_US.UTF-8 -export LC_ALL=en_US.UTF-8 - -ln -s /usr/bin/cmake3 /usr/bin/cmake - -# For LLVM to pick right libstdc++ -ln -s /opt/rh/devtoolset-9/root/usr/lib/gcc/x86_64-redhat-linux/9 /usr/lib/gcc/x86_64-redhat-linux - -# SLES 11 has older glibc than CentOS 7, so pre-built binary for it works on CentOS 7 -LLVM_VERSION=10.0.0 - -case $ARCH in - 'x86_64' ) - LLVM_DISTRO="x86_64-linux-sles11.3" - LLVM_SHA256SUM="a7a3c2a7aff813bb10932636a6f1612e308256a5e6b5a5655068d5c5b7f80e86" - ;; - 'aarch64' ) - LLVM_DISTRO="aarch64-linux-gnu" - LLVM_SHA256SUM="c2072390dc6c8b4cc67737f487ef384148253a6a97b38030e012c4d7214b7295" - ;; -esac - -# httpd24 is equired by rh-git218 -echo "/opt/rh/httpd24/root/usr/lib64" > /etc/ld.so.conf.d/httpd24.conf -ldconfig - -# Setup tcpdump for non-root. -groupadd -r pcap -chgrp pcap /usr/sbin/tcpdump -chmod 750 /usr/sbin/tcpdump -setcap cap_net_raw,cap_net_admin=eip /usr/sbin/tcpdump - -# The build_container_common.sh will be skipped when building centOS -# image on Arm64 platform since some building issues are still unsolved. -# It will be fixed until those issues solved on Arm64 platform. -if [[ $(uname -m) == "aarch64" ]] && grep -q -e rhel /etc/*-release ; then - echo "Now, the CentOS image can not be built on arm64 platform!" - exit 0 -fi - -source ./build_container_common.sh - -yum clean all