diff --git a/.github/workflows/build-push-env-docker.yml b/.github/workflows/build-push-env-docker.yml index bc6bf447da..4098eef132 100644 --- a/.github/workflows/build-push-env-docker.yml +++ b/.github/workflows/build-push-env-docker.yml @@ -35,7 +35,7 @@ jobs: build_compilation_env_docker_images: runs-on: ubuntu-latest env: - # The glibc version on ubuntu1804 and centos7 is lower than the node20 required, so + # The glibc version on ubuntu1804 is lower than the node20 required, so # we need to force the node version to 16. # See more details: https://github.com/actions/checkout/issues/1809 ACTIONS_RUNNER_FORCE_ACTIONS_NODE_VERSION: node16 @@ -47,10 +47,9 @@ jobs: - ubuntu1804 - ubuntu2004 - ubuntu2204 - - centos7 steps: - name: Checkout - # The glibc version on ubuntu1804 and centos7 is lower than the actions/checkout@v4 required, so + # The glibc version on ubuntu1804 is lower than the actions/checkout@v4 required, so # we need to force to use actions/checkout@v3. uses: actions/checkout@v4 - name: Set up QEMU diff --git a/.github/workflows/lint_and_test_cpp.yaml b/.github/workflows/lint_and_test_cpp.yaml index c30a82d422..79ee41c20e 100644 --- a/.github/workflows/lint_and_test_cpp.yaml +++ b/.github/workflows/lint_and_test_cpp.yaml @@ -444,8 +444,8 @@ jobs: ./run.sh build --test --skip_thirdparty -j $(sysctl -n hw.physicalcpu) ccache -s - build_debug_on_centos7: - name: Build Debug on CentOS 7 + build_debug_on_ubuntu: + name: Build Debug on Ubuntu 2204 needs: - cpp_clang_format_linter runs-on: ubuntu-latest @@ -456,7 +456,7 @@ jobs: ACTIONS_RUNNER_FORCE_ACTIONS_NODE_VERSION: node16 ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true container: - image: apache/pegasus:thirdparties-bin-centos7-${{ github.base_ref }} + image: apache/pegasus:thirdparties-bin-ubuntu2204-${{ github.base_ref }} steps: - name: Clone code uses: actions/checkout@v3 diff --git a/.github/workflows/regular-build.yml b/.github/workflows/regular-build.yml index 01c17f4fc7..eca53bdbd4 100644 --- a/.github/workflows/regular-build.yml +++ b/.github/workflows/regular-build.yml @@ -47,7 +47,7 @@ jobs: name: Build Cpp runs-on: ubuntu-latest env: - # The glibc version on ubuntu1804 and centos7 is lower than the node20 required, so + # The glibc version on ubuntu1804 is lower than the node20 required, so # we need to force the node version to 16. # See more details: https://github.com/actions/checkout/issues/1809 ACTIONS_RUNNER_FORCE_ACTIONS_NODE_VERSION: node16 @@ -59,7 +59,6 @@ jobs: - ubuntu1804 - ubuntu2004 - ubuntu2204 - - centos7 compiler: - "gcc,g++" include: @@ -76,7 +75,7 @@ jobs: working-directory: /root/incubator-pegasus steps: - name: Clone Apache Pegasus Source - # The glibc version on ubuntu1804 and centos7 is lower than the actions/checkout@v4 required, so + # The glibc version on ubuntu1804 and is lower than the actions/checkout@v4 required, so # we need to force to use actions/checkout@v3. uses: actions/checkout@v3 - name: Unpack prebuilt third-parties diff --git a/.github/workflows/thirdparty-regular-push.yml b/.github/workflows/thirdparty-regular-push.yml index 6ce68aae10..2dc65a92ec 100644 --- a/.github/workflows/thirdparty-regular-push.yml +++ b/.github/workflows/thirdparty-regular-push.yml @@ -79,7 +79,7 @@ jobs: build_push_bin_docker_images: runs-on: ubuntu-latest env: - # The glibc version on ubuntu1804 and centos7 is lower than the node20 required, so + # The glibc version on ubuntu1804 is lower than the node20 required, so # we need to force the node version to 16. # See more details: https://github.com/actions/checkout/issues/1809 ACTIONS_RUNNER_FORCE_ACTIONS_NODE_VERSION: node16 @@ -95,7 +95,7 @@ jobs: # TODO(wangdan): disable centos7 temporarily before image build-env-centos7-* is fixed. # - centos7 steps: - # The glibc version on ubuntu1804 and centos7 is lower than the actions/checkout@v4 required, so + # The glibc version on ubuntu1804 is lower than the actions/checkout@v4 required, so # we need to force to use actions/checkout@v3. - uses: actions/checkout@v3 - name: Set up QEMU @@ -124,7 +124,6 @@ jobs: build_push_bin_jemalloc_docker_images: runs-on: ubuntu-latest env: - # The glibc version on ubuntu1804 and centos7 is lower than the node20 required, so # we need to force the node version to 16. # See more details: https://github.com/actions/checkout/issues/1809 ACTIONS_RUNNER_FORCE_ACTIONS_NODE_VERSION: node16 @@ -140,7 +139,7 @@ jobs: # TODO(wangdan): disable centos7 temporarily before image build-env-centos7-* is fixed. # - centos7 steps: - # The glibc version on ubuntu1804 and centos7 is lower than the actions/checkout@v4 required, so + # The glibc version on ubuntu1804 and is lower than the actions/checkout@v4 required, so # we need to force to use actions/checkout@v3. - uses: actions/checkout@v3 - name: Set up QEMU diff --git a/docker/README.md b/docker/README.md index 2d454e1e22..fd7a787bb8 100644 --- a/docker/README.md +++ b/docker/README.md @@ -35,7 +35,6 @@ Building environment for Pegasus compilation. Github Actions automatically rebuilds and publishes build-env for every commit. -- `apache/pegasus:build-env-centos7-` - `apache/pegasus:build-env-ubuntu1804-` - `apache/pegasus:build-env-ubuntu2004-` - `apache/pegasus:build-env-ubuntu2204-` @@ -61,7 +60,6 @@ without downloading from the cloud object storage. This is a Docker image for Pegasus unit-testing. It prebuilts the thirdparty libraries, so jobs based on this image can skip building third-parties. -- `apache/pegasus:thirdparties-bin-centos7-` - `apache/pegasus:thirdparties-bin-ubuntu1804-` - `apache/pegasus:thirdparties-bin-ubuntu2004-` - `apache/pegasus:thirdparties-bin-ubuntu2204-` diff --git a/docker/bcc-centos7/Dockerfile b/docker/bcc-centos7/Dockerfile index c6129662fb..56a666ba8d 100644 --- a/docker/bcc-centos7/Dockerfile +++ b/docker/bcc-centos7/Dockerfile @@ -15,6 +15,8 @@ # specific language governing permissions and limitations # under the License. +# todo remove centos + FROM centos:7.5.1804 as builder LABEL maintainer=wutao diff --git a/docker/pegasus-build-env/centos7/Dockerfile b/docker/pegasus-build-env/centos7/Dockerfile deleted file mode 100644 index 12db0544f8..0000000000 --- a/docker/pegasus-build-env/centos7/Dockerfile +++ /dev/null @@ -1,80 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. - -FROM centos:7.5.1804 - -LABEL maintainer=wutao - -RUN sed -i s/mirror.centos.org/vault.centos.org/g /etc/yum.repos.d/*.repo && \ - sed -i s/^#.*baseurl=http/baseurl=http/g /etc/yum.repos.d/*.repo && \ - sed -i s/^mirrorlist=http/#mirrorlist=http/g /etc/yum.repos.d/*.repo && \ - yum -y install centos-release-scl \ - scl-utils \ - epel-release && \ - sed -i s/mirror.centos.org/vault.centos.org/g /etc/yum.repos.d/*.repo && \ - sed -i s/^#.*baseurl=http/baseurl=http/g /etc/yum.repos.d/*.repo && \ - sed -i s/^mirrorlist=http/#mirrorlist=http/g /etc/yum.repos.d/*.repo && \ - yum -y install devtoolset-7-gcc \ - devtoolset-7-gcc-c++ \ - java-1.8.0-openjdk-devel.x86_64 \ - python3 \ - automake \ - autoconf \ - make \ - libtool \ - git \ - file \ - wget \ - ccache \ - nmap-ncat \ - zip \ - gdb \ - vim \ - unzip \ - which \ - openssl-devel \ - libaio-devel \ - zlib \ - zlib-devel \ - bison \ - flex \ - krb5-devel \ - cyrus-sasl-devel \ - patch && \ - yum -y install ca-certificates && \ - yum clean all && \ - rm -rf /var/cache/yum; - -ENV PATH="/opt/rh/devtoolset-7/root/bin/:${PATH}" - -RUN pip3 install --upgrade pip --no-cache-dir && pip3 install --no-cache-dir cmake -i https://pypi.tuna.tsinghua.edu.cn/simple - -RUN wget --progress=dot:giga https://archive.apache.org/dist/maven/maven-3/3.8.3/binaries/apache-maven-3.8.3-bin.tar.gz -P /opt/maven \ - && cd /opt/maven \ - && tar -zxf apache-maven-3.8.3-bin.tar.gz \ - && rm apache-maven-3.8.3-bin.tar.gz - -RUN wget --progress=dot:giga https://github.com/apache/thrift/archive/refs/tags/0.11.0.tar.gz -P /opt/thrift && \ - cd /opt/thrift && tar xzf 0.11.0.tar.gz && cd thrift-0.11.0 && ./bootstrap.sh && \ - ./configure --enable-libs=no && \ - make -j$(($(nproc)/2+1)) && make install && cd - && \ - rm -rf thrift-0.11.0 0.11.0.tar.gz - -ENV JAVA_HOME=/usr/lib/jvm/java-1.8.0-openjdk -ENV PATH="/opt/maven/apache-maven-3.8.3/bin:${PATH}" - -WORKDIR /root/apache diff --git a/docker/thirdparties-bin/Dockerfile b/docker/thirdparties-bin/Dockerfile index 438669f932..68ee382ff7 100644 --- a/docker/thirdparties-bin/Dockerfile +++ b/docker/thirdparties-bin/Dockerfile @@ -16,7 +16,7 @@ # under the License. ARG GITHUB_BRANCH=master -ARG OS_VERSION=centos7 +ARG OS_VERSION=ubuntu2204 FROM apache/pegasus:thirdparties-src-${OS_VERSION}-${GITHUB_BRANCH} as builder FROM apache/pegasus:build-env-${OS_VERSION}-${GITHUB_BRANCH} diff --git a/docker/thirdparties-src/Dockerfile b/docker/thirdparties-src/Dockerfile index c61a82417a..dde31b94e4 100644 --- a/docker/thirdparties-src/Dockerfile +++ b/docker/thirdparties-src/Dockerfile @@ -16,7 +16,7 @@ # under the License. ARG GITHUB_BRANCH=master -ARG OS_VERSION=centos7 +ARG OS_VERSION=ubuntu2204 FROM apache/pegasus:build-env-${OS_VERSION}-${GITHUB_BRANCH} as builder WORKDIR /root